3 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
index 4068166c8993..59a512672bb9 100644
--- a/arch/arm/mach-ixp2000/core.c
+++ b/arch/arm/mach-ixp2000/core.c
@@ -13,7 +13,7 @@
 * License version 2. This program is licensed "as is" without any 
 * warranty of any kind, whether express or implied.
 */
+#include <linux/gpio.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
@@ -39,7 +39,7 @@
 #include <asm/mach/time.h>
 #include <asm/mach/irq.h>
-#include <mach/gpio.h>
+#include <mach/gpio-ixp2000.h>
 static DEFINE_SPINLOCK(ixp2000_slowport_lock);
 static unsigned long ixp2000_slowport_irq_flags;
diff --git a/arch/arm/mach-ixp2000/include/mach/gpio.h b/arch/arm/mach-ixp2000/include/mach/gpio-ixp2000.h
index 4a88d2c33dac..af836c76c3f1 100644
--- a/arch/arm/mach-ixp2000/include/mach/gpio.h
+++ b/arch/arm/mach-ixp2000/include/mach/gpio-ixp2000.h
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2002 Intel Corporation.
 *
- * This program is free software, you can redistribute it and/or modify 
+ * This program is free software, you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
 */
@@ -11,7 +11,7 @@
 /*
 * IXP2000 GPIO in/out, edge/level detection for IRQs:
 * IRQs are generated on Falling-edge, Rising-Edge, Level-low, Level-High
- * or both Falling-edge and Rising-edge.  
+ * or both Falling-edge and Rising-edge.
 * This must be called *before* the corresponding IRQ is registerd.
 * Use this instead of directly setting the GPIO registers.
 * GPIOs may also be used as GPIOs (e.g. for emulating i2c/smb)
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c
index 235638f800e5..634b6c852f68 100644
--- a/arch/arm/mach-ixp2000/ixdp2x00.c
+++ b/arch/arm/mach-ixp2000/ixdp2x00.c
@@ -14,6 +14,7 @@
 *  Free Software Foundation;  either version 2 of the  License, or (at your
 *  option) any later version.
 */
+#include <linux/gpio.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/mm.h>
@@ -40,8 +41,7 @@
 #include <asm/mach/flash.h>
 #include <asm/mach/arch.h>
-#include <mach/gpio.h>
+#include <mach/gpio-ixp2000.h>
 /*************************************************************************
 * IXDP2x00 IRQ Initialization

diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c index 4068166c8993..59a512672bb9 100644 --- a/arch/arm/mach-ixp2000/core.c +++ b/arch/arm/mach-ixp2000/core.c
@@ -13,7 +13,7 @@
13	* License version 2. This program is licensed "as is" without any	13	* License version 2. This program is licensed "as is" without any
14	* warranty of any kind, whether express or implied.	14	* warranty of any kind, whether express or implied.
15	*/	15	*/
16		16	#include <linux/gpio.h>
17	#include <linux/kernel.h>	17	#include <linux/kernel.h>
18	#include <linux/init.h>	18	#include <linux/init.h>
19	#include <linux/spinlock.h>	19	#include <linux/spinlock.h>
@@ -39,7 +39,7 @@
39	#include <asm/mach/time.h>	39	#include <asm/mach/time.h>
40	#include <asm/mach/irq.h>	40	#include <asm/mach/irq.h>
41		41
42	#include <mach/gpio.h>	42	#include <mach/gpio-ixp2000.h>
43		43
44	static DEFINE_SPINLOCK(ixp2000_slowport_lock);	44	static DEFINE_SPINLOCK(ixp2000_slowport_lock);
45	static unsigned long ixp2000_slowport_irq_flags;	45	static unsigned long ixp2000_slowport_irq_flags;


diff --git a/arch/arm/mach-ixp2000/include/mach/gpio.h b/arch/arm/mach-ixp2000/include/mach/gpio-ixp2000.h index 4a88d2c33dac..af836c76c3f1 100644 --- a/arch/arm/mach-ixp2000/include/mach/gpio.h +++ b/arch/arm/mach-ixp2000/include/mach/gpio-ixp2000.h
@@ -3,7 +3,7 @@
3	*	3	*
4	* Copyright (C) 2002 Intel Corporation.	4	* Copyright (C) 2002 Intel Corporation.
5	*	5	*
6	* This program is free software, you can redistribute it and/or modify	6	* This program is free software, you can redistribute it and/or modify
7	* it under the terms of the GNU General Public License version 2 as	7	* it under the terms of the GNU General Public License version 2 as
8	* published by the Free Software Foundation.	8	* published by the Free Software Foundation.
9	*/	9	*/
@@ -11,7 +11,7 @@
11	/*	11	/*
12	* IXP2000 GPIO in/out, edge/level detection for IRQs:	12	* IXP2000 GPIO in/out, edge/level detection for IRQs:
13	* IRQs are generated on Falling-edge, Rising-Edge, Level-low, Level-High	13	* IRQs are generated on Falling-edge, Rising-Edge, Level-low, Level-High
14	* or both Falling-edge and Rising-edge.	14	* or both Falling-edge and Rising-edge.
15	* This must be called before the corresponding IRQ is registerd.	15	* This must be called before the corresponding IRQ is registerd.
16	* Use this instead of directly setting the GPIO registers.	16	* Use this instead of directly setting the GPIO registers.
17	* GPIOs may also be used as GPIOs (e.g. for emulating i2c/smb)	17	* GPIOs may also be used as GPIOs (e.g. for emulating i2c/smb)


diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c index 235638f800e5..634b6c852f68 100644 --- a/arch/arm/mach-ixp2000/ixdp2x00.c +++ b/arch/arm/mach-ixp2000/ixdp2x00.c
@@ -14,6 +14,7 @@
14	* Free Software Foundation; either version 2 of the License, or (at your	14	* Free Software Foundation; either version 2 of the License, or (at your
15	* option) any later version.	15	* option) any later version.
16	*/	16	*/
		17	#include <linux/gpio.h>
17	#include <linux/kernel.h>	18	#include <linux/kernel.h>
18	#include <linux/init.h>	19	#include <linux/init.h>
19	#include <linux/mm.h>	20	#include <linux/mm.h>
@@ -40,8 +41,7 @@
40	#include <asm/mach/flash.h>	41	#include <asm/mach/flash.h>
41	#include <asm/mach/arch.h>	42	#include <asm/mach/arch.h>
42		43
43	#include <mach/gpio.h>	44	#include <mach/gpio-ixp2000.h>
44
45		45
46	/*************************************************************************	46	/*************************************************************************
47	* IXDP2x00 IRQ Initialization	47	* IXDP2x00 IRQ Initialization