From 2f8163baada3dbd0ce891c35bc59ae46e773487a Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 26 Jul 2011 10:53:52 +0100 Subject: 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 --- arch/arm/mach-pnx4008/serial.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'arch/arm/mach-pnx4008/serial.c') diff --git a/arch/arm/mach-pnx4008/serial.c b/arch/arm/mach-pnx4008/serial.c index f40961e51914..eb29face3bb3 100644 --- a/arch/arm/mach-pnx4008/serial.c +++ b/arch/arm/mach-pnx4008/serial.c @@ -9,7 +9,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include #include #include #include @@ -19,7 +19,6 @@ #include #include -#include #include -- cgit v1.2.3 From a1e6b41e8ec152efceb3128592b83d40c8a28334 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Tue, 23 Aug 2011 12:51:24 +0100 Subject: ARM: 7057/1: mach-pnx4008: rename GPIO header The PNX4008 header file is using the generic gpio and gpiolib namespace in yet the GPIO interface is not generic at all so rename it to This fixes a build failure in current -next: the includes were changed from to but since this platform isn't using generic gpio did not include and things broke apart. Acked-by: Vitaly Wool Signed-off-by: Linus Walleij Signed-off-by: Russell King --- arch/arm/mach-pnx4008/serial.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-pnx4008/serial.c') diff --git a/arch/arm/mach-pnx4008/serial.c b/arch/arm/mach-pnx4008/serial.c index eb29face3bb3..374c138ac1ac 100644 --- a/arch/arm/mach-pnx4008/serial.c +++ b/arch/arm/mach-pnx4008/serial.c @@ -9,7 +9,6 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include #include #include #include @@ -20,6 +19,7 @@ #include #include +#include #include #define UART_3 0 -- cgit v1.2.3