---

yaml --- r: 269414 b: refs/heads/master c: a1e6b41 h: refs/heads/master v: v3
git-mirror · Aug 23, 2011 · 7cb3a01 · 7cb3a01
1 parent 06c6d07
commit 7cb3a01
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94117cb8db3b6377ae5d68edd724211e9a607326
+refs/heads/master: a1e6b41e8ec152efceb3128592b83d40c8a28334
diff --git a/trunk/arch/arm/mach-pnx4008/gpio.c b/trunk/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 → .../mach-pnx4008/include/mach/gpio-pnx4008.h b/...arch/arm/mach-pnx4008/include/mach/gpio.h → .../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/trunk/arch/arm/mach-pnx4008/serial.c b/trunk/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