From patchwork Tue Aug 30 11:00:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 9305209 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 028F960756 for ; Tue, 30 Aug 2016 11:05:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E759828B83 for ; Tue, 30 Aug 2016 11:05:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DAC6028B8C; Tue, 30 Aug 2016 11:05:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E38F228B83 for ; Tue, 30 Aug 2016 11:05:16 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1begox-0008TW-G9; Tue, 30 Aug 2016 11:03:11 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1begn5-00071i-6B for linux-arm-kernel@lists.infradead.org; Tue, 30 Aug 2016 11:01:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2014; h=Date:Sender:Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Subject:To:From:References:In-Reply-To; bh=1vYpzQW4BrV7lWrGDElYCrv4lnly+GcuVZkRPaO1S6A=; b=h/XScXvdzHaEotAVrZzecXmg5jo+Yhpm6Cfat1GGD2zU7i0LcdLTLZw8C9+0/kGu9pGc/izczG1AS82j7ROrAIBZk9cq0/7vYaYuvdaNgHtbr2WVNfkSGQlQjr/i7SmaL7P6HUHnnmBfLy1rWlzutFdfW4lTdH0uZ7UhoYd1J5A=; Received: from e0022681537dd.dyn.armlinux.org.uk ([2001:4d48:ad52:3201:222:68ff:fe15:37dd]:56408 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1begmi-0004ZT-8Q for linux-arm-kernel@lists.infradead.org; Tue, 30 Aug 2016 12:00:52 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1begmh-0007IX-Al for linux-arm-kernel@lists.infradead.org; Tue, 30 Aug 2016 12:00:51 +0100 In-Reply-To: <20160830105950.GA15580@n2100.armlinux.org.uk> References: <20160830105950.GA15580@n2100.armlinux.org.uk> From: Russell King To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 6/8] ARM: sa1100/nanoengine: move nanoengine header file MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Tue, 30 Aug 2016 12:00:51 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160830_040115_626546_657B354D X-CRM114-Status: GOOD ( 10.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Nothing outside arch/arm/mach-sa1100 needs the nanoengine header file, so move it into that directory. Signed-off-by: Russell King --- arch/arm/mach-sa1100/nanoengine.c | 2 +- arch/arm/mach-sa1100/{include/mach => }/nanoengine.h | 0 arch/arm/mach-sa1100/pci-nanoengine.c | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) rename arch/arm/mach-sa1100/{include/mach => }/nanoengine.h (100%) diff --git a/arch/arm/mach-sa1100/nanoengine.c b/arch/arm/mach-sa1100/nanoengine.c index 4d35258a7b32..51e8ab94cd6d 100644 --- a/arch/arm/mach-sa1100/nanoengine.c +++ b/arch/arm/mach-sa1100/nanoengine.c @@ -28,10 +28,10 @@ #include #include -#include #include #include "generic.h" +#include "nanoengine.h" /* Flash bank 0 */ static struct mtd_partition nanoengine_partitions[] = { diff --git a/arch/arm/mach-sa1100/include/mach/nanoengine.h b/arch/arm/mach-sa1100/nanoengine.h similarity index 100% rename from arch/arm/mach-sa1100/include/mach/nanoengine.h rename to arch/arm/mach-sa1100/nanoengine.h diff --git a/arch/arm/mach-sa1100/pci-nanoengine.c b/arch/arm/mach-sa1100/pci-nanoengine.c index d7ae8d50f6d8..81c5e7f68135 100644 --- a/arch/arm/mach-sa1100/pci-nanoengine.c +++ b/arch/arm/mach-sa1100/pci-nanoengine.c @@ -26,9 +26,10 @@ #include #include -#include #include +#include "nanoengine.h" + static void __iomem *nanoengine_pci_map_bus(struct pci_bus *bus, unsigned int devfn, int where) {