git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'depends/rmk/memory_h' into next/fixes
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp4xx
/
nas100d-setup.c
diff --git
a/arch/arm/mach-ixp4xx/nas100d-setup.c
b/arch/arm/mach-ixp4xx/nas100d-setup.c
index
9f46692
..
de716fa
100644
(file)
--- a/
arch/arm/mach-ixp4xx/nas100d-setup.c
+++ b/
arch/arm/mach-ixp4xx/nas100d-setup.c
@@
-17,7
+17,7
@@
* Maintainers: http://www.nslu2-linux.org/
*
*/
* Maintainers: http://www.nslu2-linux.org/
*
*/
-
+#include <linux/gpio.h>
#include <linux/if_ether.h>
#include <linux/irq.h>
#include <linux/jiffies.h>
#include <linux/if_ether.h>
#include <linux/irq.h>
#include <linux/jiffies.h>
@@
-32,7
+32,6
@@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/flash.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/flash.h>
-#include <asm/gpio.h>
#define NAS100D_SDA_PIN 5
#define NAS100D_SCL_PIN 6
#define NAS100D_SDA_PIN 5
#define NAS100D_SCL_PIN 6