From patchwork Tue Aug 9 08:05:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King - ARM Linux X-Patchwork-Id: 1047782 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7985dnd000851 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 9 Aug 2011 08:06:01 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QqhJU-0002Qn-IY; Tue, 09 Aug 2011 08:05:24 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QqhJT-00076r-RI; Tue, 09 Aug 2011 08:05:23 +0000 Received: from [2002:4e20:1eda::1] (helo=caramon.arm.linux.org.uk) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QqhJE-00072w-FK for linux-arm-kernel@lists.infradead.org; Tue, 09 Aug 2011 08:05:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Date:Sender:Message-Id:Content-Type:MIME-Version:Cc:Subject:Cc:To:From:References:In-Reply-To; bh=wM0bxoX0dQkkYANbrD2nEtFrdmE22gcLd03w8b5yt2Y=; b=WBtwvK9qWSM8pLQBWhcRUc3XSLwi9r9JnYHvyxDqsP9BJF5CFcdLCXRBO8onGgqjcOy01EmT7zPK74kCj/jyrp0nYeCei1jqKUlHNwsnRsUr+YB7dU0V2bfns3HPyA9xvuy18ULZ60JzYksf1ETg6NEoUDg2pDi5ZtuOvcLLNpI=; Received: from e0022681537dd.dyn.arm.linux.org.uk ([2002:4e20:1eda:1:222:68ff:fe15:37dd] helo=rmk-PC.arm.linux.org.uk) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1QqhJ7-0000cy-3s; Tue, 09 Aug 2011 09:05:02 +0100 Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1QqhJ6-0003a4-Eu; Tue, 09 Aug 2011 09:05:00 +0100 In-Reply-To: <20110809080411.GA1831@n2100.arm.linux.org.uk> References: <20110809080411.GA1831@n2100.arm.linux.org.uk> From: Russell King - ARM Linux To: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-sh@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH 02/13] ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Tue, 09 Aug 2011 09:05:00 +0100 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110809_040511_998606_A0A37723 X-CRM114-Status: GOOD ( 14.44 ) X-Spam-Score: 1.2 (+) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS Cc: Grant Likely , Nicolas Pitre X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 09 Aug 2011 08:06:02 +0000 (UTC) Convert arch/arm includes of mach/gpio.h and asm/gpio.h to linux/gpio.h before we start consolidating the individual platform implementations of the gpio header files. Signed-off-by: Russell King --- arch/arm/common/scoop.c | 2 +- arch/arm/mach-at91/at91cap9_devices.c | 2 +- arch/arm/mach-at91/at91rm9200_devices.c | 2 +- arch/arm/mach-at91/at91sam9260_devices.c | 2 +- arch/arm/mach-at91/at91sam9261_devices.c | 2 +- arch/arm/mach-at91/at91sam9263_devices.c | 2 +- arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- arch/arm/mach-at91/at91sam9rl_devices.c | 2 +- arch/arm/mach-at91/board-1arm.c | 2 +- arch/arm/mach-at91/board-afeb-9260v1.c | 2 +- arch/arm/mach-at91/board-cam60.c | 2 +- arch/arm/mach-at91/board-cap9adk.c | 2 +- arch/arm/mach-at91/board-carmeva.c | 2 +- arch/arm/mach-at91/board-cpu9krea.c | 2 +- arch/arm/mach-at91/board-cpuat91.c | 2 +- arch/arm/mach-at91/board-csb337.c | 2 +- arch/arm/mach-at91/board-csb637.c | 2 +- arch/arm/mach-at91/board-eb9200.c | 2 +- arch/arm/mach-at91/board-ecbat91.c | 2 +- arch/arm/mach-at91/board-kafa.c | 2 +- arch/arm/mach-at91/board-kb9202.c | 2 +- arch/arm/mach-at91/board-neocore926.c | 2 +- arch/arm/mach-at91/board-picotux200.c | 2 +- arch/arm/mach-at91/board-qil-a9260.c | 2 +- arch/arm/mach-at91/board-rm9200dk.c | 2 +- arch/arm/mach-at91/board-rm9200ek.c | 2 +- arch/arm/mach-at91/board-sam9-l9260.c | 2 +- arch/arm/mach-at91/board-sam9260ek.c | 2 +- arch/arm/mach-at91/board-sam9261ek.c | 2 +- arch/arm/mach-at91/board-sam9263ek.c | 2 +- arch/arm/mach-at91/board-sam9g20ek.c | 2 +- arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +- arch/arm/mach-at91/board-sam9rlek.c | 2 +- arch/arm/mach-at91/board-usb-a9260.c | 2 +- arch/arm/mach-at91/board-usb-a9263.c | 2 +- arch/arm/mach-at91/board-yl-9200.c | 2 +- arch/arm/mach-at91/gpio.c | 3 +-- arch/arm/mach-at91/leds.c | 2 +- arch/arm/mach-at91/pm.c | 2 +- arch/arm/mach-davinci/da830.c | 2 +- arch/arm/mach-davinci/da850.c | 2 +- arch/arm/mach-davinci/gpio.c | 4 +--- arch/arm/mach-davinci/tnetv107x.c | 2 +- arch/arm/mach-imx/iomux-imx31.c | 3 +-- arch/arm/mach-imx/mach-mx27ads.c | 3 +-- arch/arm/mach-ixp2000/core.c | 4 +--- arch/arm/mach-ixp2000/ixdp2x00.c | 3 +-- arch/arm/mach-ixp4xx/dsmg600-setup.c | 3 +-- arch/arm/mach-ixp4xx/fsg-setup.c | 3 +-- arch/arm/mach-ixp4xx/nas100d-setup.c | 3 +-- arch/arm/mach-ixp4xx/nslu2-setup.c | 3 +-- arch/arm/mach-kirkwood/irq.c | 3 +-- arch/arm/mach-kirkwood/mpp.c | 3 +-- arch/arm/mach-ks8695/board-acs5k.c | 3 +-- arch/arm/mach-ks8695/board-dsm320.c | 3 +-- arch/arm/mach-ks8695/board-micrel.c | 3 +-- arch/arm/mach-ks8695/gpio.c | 3 +-- arch/arm/mach-ks8695/leds.c | 3 +-- arch/arm/mach-mmp/aspenite.c | 3 +-- arch/arm/mach-mmp/mmp2.c | 3 +-- arch/arm/mach-mmp/pxa168.c | 3 +-- arch/arm/mach-mmp/pxa910.c | 3 +-- arch/arm/mach-mmp/tavorevb.c | 3 +-- arch/arm/mach-msm/board-msm7x27.c | 3 +-- arch/arm/mach-msm/board-msm7x30.c | 3 +-- arch/arm/mach-msm/board-qsd8x50.c | 3 +-- arch/arm/mach-msm/board-sapphire.c | 3 +-- arch/arm/mach-msm/board-trout-mmc.c | 3 +-- arch/arm/mach-msm/board-trout-panel.c | 3 +-- arch/arm/mach-mv78xx0/irq.c | 3 +-- arch/arm/mach-mv78xx0/mpp.c | 3 +-- arch/arm/mach-omap1/board-ams-delta.c | 3 +-- arch/arm/mach-omap1/board-fsample.c | 3 +-- arch/arm/mach-omap1/board-generic.c | 3 +-- arch/arm/mach-omap1/board-h2-mmc.c | 3 +-- arch/arm/mach-omap1/board-h2.c | 3 +-- arch/arm/mach-omap1/board-h3-mmc.c | 3 +-- arch/arm/mach-omap1/board-h3.c | 3 +-- arch/arm/mach-omap1/board-htcherald.c | 1 - arch/arm/mach-omap1/board-innovator.c | 3 +-- arch/arm/mach-omap1/board-nokia770.c | 3 +-- arch/arm/mach-omap1/board-osk.c | 3 +-- arch/arm/mach-omap1/board-palmte.c | 3 +-- arch/arm/mach-omap1/board-palmtt.c | 2 +- arch/arm/mach-omap1/board-palmz71.c | 2 +- arch/arm/mach-omap1/board-perseus2.c | 3 +-- arch/arm/mach-omap1/board-sx1-mmc.c | 2 +- arch/arm/mach-omap1/board-sx1.c | 3 +-- arch/arm/mach-omap1/board-voiceblue.c | 2 +- arch/arm/mach-omap1/devices.c | 2 +- arch/arm/mach-omap1/fpga.c | 2 +- arch/arm/mach-omap1/irq.c | 3 +-- arch/arm/mach-omap1/leds-h2p2-debug.c | 2 +- arch/arm/mach-omap1/leds-osk.c | 3 +-- arch/arm/mach-omap1/leds.c | 2 +- arch/arm/mach-omap1/serial.c | 3 +-- arch/arm/mach-omap2/board-generic.c | 3 +-- arch/arm/mach-omap2/board-h4.c | 3 +-- arch/arm/mach-omap2/board-ldp.c | 3 +-- arch/arm/mach-omap2/devices.c | 3 +-- arch/arm/mach-orion5x/db88f5281-setup.c | 3 +-- arch/arm/mach-orion5x/dns323-setup.c | 3 +-- arch/arm/mach-orion5x/irq.c | 3 +-- arch/arm/mach-orion5x/kurobox_pro-setup.c | 3 +-- arch/arm/mach-orion5x/mv2120-setup.c | 3 +-- arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 3 +-- arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 3 +-- arch/arm/mach-orion5x/rd88f5182-setup.c | 3 +-- arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 3 +-- arch/arm/mach-orion5x/terastation_pro2-setup.c | 3 +-- arch/arm/mach-orion5x/ts209-setup.c | 3 +-- arch/arm/mach-orion5x/ts409-setup.c | 3 +-- arch/arm/mach-orion5x/wnr854t-setup.c | 3 +-- arch/arm/mach-orion5x/wrt350n-v2-setup.c | 3 +-- arch/arm/mach-pnx4008/gpio.c | 3 +-- arch/arm/mach-pnx4008/serial.c | 3 +-- arch/arm/mach-pxa/generic.c | 2 +- arch/arm/mach-pxa/include/mach/littleton.h | 2 +- arch/arm/mach-pxa/irq.c | 3 +-- arch/arm/mach-pxa/lpd270.c | 3 +-- arch/arm/mach-pxa/lubbock.c | 2 +- arch/arm/mach-pxa/mainstone.c | 3 +-- arch/arm/mach-pxa/mfp-pxa2xx.c | 3 +-- arch/arm/mach-pxa/pcm990-baseboard.c | 3 +-- arch/arm/mach-pxa/pxa25x.c | 2 +- arch/arm/mach-pxa/pxa27x.c | 2 +- arch/arm/mach-pxa/pxa3xx.c | 3 +-- arch/arm/mach-pxa/pxa95x.c | 3 +-- arch/arm/mach-pxa/saarb.c | 3 +-- arch/arm/mach-s3c2410/include/mach/h1940-latch.h | 2 +- arch/arm/mach-sa1100/generic.c | 2 +- arch/arm/mach-sa1100/gpio.c | 3 +-- arch/arm/mach-tegra/board-trimslice-pinmux.c | 3 +-- arch/arm/mach-ux500/board-mop500-u8500uib.c | 3 +-- arch/arm/plat-omap/debug-devices.c | 3 +-- arch/arm/plat-omap/debug-leds.c | 3 +-- arch/arm/plat-omap/devices.c | 3 +-- arch/arm/plat-pxa/gpio.c | 4 +--- 138 files changed, 137 insertions(+), 222 deletions(-) diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c index a07b0e7..1cde34a 100644 --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c @@ -12,11 +12,11 @@ */ #include +#include #include #include #include #include -#include #include /* PCMCIA to Scoop linkage diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c index dba0d8d..f87f504 100644 --- a/arch/arm/mach-at91/at91cap9_devices.c +++ b/arch/arm/mach-at91/at91cap9_devices.c @@ -16,6 +16,7 @@ #include #include +#include #include #include @@ -23,7 +24,6 @@ #include #include -#include #include #include #include diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c index 7227755..978be95 100644 --- a/arch/arm/mach-at91/at91rm9200_devices.c +++ b/arch/arm/mach-at91/at91rm9200_devices.c @@ -14,11 +14,11 @@ #include #include +#include #include #include #include -#include #include #include diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index 39f81f4..a53b3de 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c @@ -13,11 +13,11 @@ #include #include +#include #include #include #include -#include #include #include #include diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index 0f91792..4e647b6 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c @@ -14,6 +14,7 @@ #include #include +#include #include #include @@ -21,7 +22,6 @@ #include