summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pnx4008
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2011-08-23 12:51:24 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-08-23 15:30:04 +0100
commita1e6b41e8ec152efceb3128592b83d40c8a28334 (patch)
tree1eb7fc2da41d9687f363ec6ae7b66bf5ac0d2880 /arch/arm/mach-pnx4008
parent94117cb8db3b6377ae5d68edd724211e9a607326 (diff)
downloadlinux-a1e6b41e8ec152efceb3128592b83d40c8a28334.tar.gz
linux-a1e6b41e8ec152efceb3128592b83d40c8a28334.tar.bz2
linux-a1e6b41e8ec152efceb3128592b83d40c8a28334.zip
ARM: 7057/1: mach-pnx4008: rename GPIO header
The PNX4008 header file is using the generic gpio and gpiolib namespace in <mach/gpio.h> yet the GPIO interface is not generic at all so rename it to <mach/gpio-pnx4008.h> This fixes a build failure in current -next: the includes were changed from <mach/gpio.h> to <linux/gpio.h> but since this platform isn't using generic gpio <linux/gpio.h> did not include <mach/gpio.h> and things broke apart. Acked-by: Vitaly Wool <vitalywool@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pnx4008')
-rw-r--r--arch/arm/mach-pnx4008/gpio.c2
-rw-r--r--arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h (renamed from arch/arm/mach-pnx4008/include/mach/gpio.h)2
-rw-r--r--arch/arm/mach-pnx4008/serial.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pnx4008/gpio.c b/arch/arm/mach-pnx4008/gpio.c
index eef531b755ca..d3e71d3847b4 100644
--- a/arch/arm/mach-pnx4008/gpio.c
+++ b/arch/arm/mach-pnx4008/gpio.c
@@ -13,13 +13,13 @@
* is licensed "as is" without any warranty of any kind, whether express
* or implied.
*/
-#include <linux/gpio.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/io.h>
#include <mach/hardware.h>
#include <mach/platform.h>
+#include <mach/gpio-pnx4008.h>
/* register definitions */
#define PIO_VA_BASE IO_ADDRESS(PNX4008_PIO_BASE)
diff --git a/arch/arm/mach-pnx4008/include/mach/gpio.h b/arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h
index 9591467eb9ec..41027dd7cf74 100644
--- a/arch/arm/mach-pnx4008/include/mach/gpio.h
+++ b/arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h
@@ -1,5 +1,5 @@
/*
- * arch/arm/mach-pnx4008/include/mach/gpio.h
+ * arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h
*
* PNX4008 GPIO driver - header file
*
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 <linux/gpio.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/io.h>
@@ -20,6 +19,7 @@
#include <linux/serial_core.h>
#include <linux/serial_reg.h>
+#include <mach/gpio-pnx4008.h>
#include <mach/clock.h>
#define UART_3 0