projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/caiaq' into for-linus
[linux-2.6]
/
arch
/
arm
/
mach-mv78xx0
/
addr-map.c
diff --git
a/arch/arm/mach-mv78xx0/addr-map.c
b/arch/arm/mach-mv78xx0/addr-map.c
index
4004b67
..
311d5b0
100644
(file)
--- a/
arch/arm/mach-mv78xx0/addr-map.c
+++ b/
arch/arm/mach-mv78xx0/addr-map.c
@@
-11,7
+11,7
@@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/mbus.h>
-#include <
asm
/io.h>
+#include <
linux
/io.h>
#include "common.h"
/*