diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-26 05:53:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-08 09:27:41 -0400 |
| commit | 2f8163baada3dbd0ce891c35bc59ae46e773487a (patch) | |
| tree | cf148d2c014e777bf374e49daa74ba68e440a5d7 /arch/arm/mach-omap2 | |
| parent | b7a949549de42e4cf8af301c63ee8af13a06a956 (diff) | |
ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h
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 <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-h4.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-ldp.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 54db41a84a9b..bb4af05c7f0a 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | * it under the terms of the GNU General Public License version 2 as | 15 | * it under the terms of the GNU General Public License version 2 as |
| 16 | * published by the Free Software Foundation. | 16 | * published by the Free Software Foundation. |
| 17 | */ | 17 | */ |
| 18 | 18 | #include <linux/gpio.h> | |
| 19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/device.h> | 21 | #include <linux/device.h> |
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
| 26 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
| 27 | 27 | ||
| 28 | #include <mach/gpio.h> | ||
| 29 | #include <plat/usb.h> | 28 | #include <plat/usb.h> |
| 30 | #include <plat/board.h> | 29 | #include <plat/board.h> |
| 31 | #include <plat/common.h> | 30 | #include <plat/common.h> |
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 45de2b319ec9..95319e761802 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | * it under the terms of the GNU General Public License version 2 as | 10 | * it under the terms of the GNU General Public License version 2 as |
| 11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
| 12 | */ | 12 | */ |
| 13 | 13 | #include <linux/gpio.h> | |
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <asm/mach/arch.h> | 31 | #include <asm/mach/arch.h> |
| 32 | #include <asm/mach/map.h> | 32 | #include <asm/mach/map.h> |
| 33 | 33 | ||
| 34 | #include <mach/gpio.h> | ||
| 35 | #include <plat/usb.h> | 34 | #include <plat/usb.h> |
| 36 | #include <plat/board.h> | 35 | #include <plat/board.h> |
| 37 | #include <plat/common.h> | 36 | #include <plat/common.h> |
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index 218764c9377e..ddff45c1688c 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | * it under the terms of the GNU General Public License version 2 as | 10 | * it under the terms of the GNU General Public License version 2 as |
| 11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
| 12 | */ | 12 | */ |
| 13 | 13 | #include <linux/gpio.h> | |
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <asm/mach/map.h> | 34 | #include <asm/mach/map.h> |
| 35 | 35 | ||
| 36 | #include <plat/mcspi.h> | 36 | #include <plat/mcspi.h> |
| 37 | #include <mach/gpio.h> | ||
| 38 | #include <plat/board.h> | 37 | #include <plat/board.h> |
| 39 | #include <plat/common.h> | 38 | #include <plat/common.h> |
| 40 | #include <plat/gpmc.h> | 39 | #include <plat/gpmc.h> |
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 1077ad663f93..5391079c8689 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | * the Free Software Foundation; either version 2 of the License, or | 8 | * the Free Software Foundation; either version 2 of the License, or |
| 9 | * (at your option) any later version. | 9 | * (at your option) any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | #include <linux/gpio.h> | |
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <plat/tc.h> | 26 | #include <plat/tc.h> |
| 27 | #include <plat/board.h> | 27 | #include <plat/board.h> |
| 28 | #include <plat/mcbsp.h> | 28 | #include <plat/mcbsp.h> |
| 29 | #include <mach/gpio.h> | ||
| 30 | #include <plat/mmc.h> | 29 | #include <plat/mmc.h> |
| 31 | #include <plat/dma.h> | 30 | #include <plat/dma.h> |
| 32 | #include <plat/omap_hwmod.h> | 31 | #include <plat/omap_hwmod.h> |