projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 's3c-move' into devel
[linux-2.6-block.git]
/
arch
/
arm
/
mach-davinci
/
psc.c
diff --git
a/arch/arm/mach-davinci/psc.c
b/arch/arm/mach-davinci/psc.c
index aa2fc375a3257fcb4a1e5b8e468dc1af7c494650..58754f066d5bba1b604b9087eaa2aefd89617288 100644
(file)
--- a/
arch/arm/mach-davinci/psc.c
+++ b/
arch/arm/mach-davinci/psc.c
@@
-21,8
+21,8
@@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
+#include <linux/io.h>
-#include <asm/io.h>
#include <mach/hardware.h>
#include <mach/psc.h>
#include <mach/mux.h>