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 'for-linus' of git://www.jni.nu/cris
[pandora-kernel.git]
/
arch
/
arm
/
mach-footbridge
/
netwinder-hw.c
diff --git
a/arch/arm/mach-footbridge/netwinder-hw.c
b/arch/arm/mach-footbridge/netwinder-hw.c
index
a1f381c
..
00b0ddc
100644
(file)
--- a/
arch/arm/mach-footbridge/netwinder-hw.c
+++ b/
arch/arm/mach-footbridge/netwinder-hw.c
@@
-10,9
+10,9
@@
#include <linux/kernel.h>
#include <linux/delay.h>
#include <linux/init.h>
+#include <linux/io.h>
#include <asm/hardware/dec21285.h>
-#include <asm/io.h>
#include <asm/leds.h>
#include <asm/mach-types.h>
#include <asm/setup.h>