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 git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-orion5x
/
addr-map.c
diff --git
a/arch/arm/mach-orion5x/addr-map.c
b/arch/arm/mach-orion5x/addr-map.c
index
bea3797
..
719957e
100644
(file)
--- a/
arch/arm/mach-orion5x/addr-map.c
+++ b/
arch/arm/mach-orion5x/addr-map.c
@@
-13,8
+13,8
@@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/mbus.h>
+#include <linux/io.h>
#include <mach/hardware.h>
-#include <asm/io.h>
#include "common.h"
/*