git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/aoa' into to-push
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s3c2410
/
include
/
mach
/
system.h
diff --git
a/arch/arm/mach-s3c2410/include/mach/system.h
b/arch/arm/mach-s3c2410/include/mach/system.h
index e9f676bc01167c233e7c82688baf2a745519c4d8..a8cbca6701e54faf00e940b5db0c1ed1fbc8fd21 100644
(file)
--- a/
arch/arm/mach-s3c2410/include/mach/system.h
+++ b/
arch/arm/mach-s3c2410/include/mach/system.h
@@
-10,8
+10,8
@@
* published by the Free Software Foundation.
*/
+#include <linux/io.h>
#include <mach/hardware.h>
-#include <asm/io.h>
#include <mach/map.h>
#include <mach/idle.h>