projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap1
/
mux.c
diff --git
a/arch/arm/mach-omap1/mux.c
b/arch/arm/mach-omap1/mux.c
index
898516e
..
062c905
100644
(file)
--- a/
arch/arm/mach-omap1/mux.c
+++ b/
arch/arm/mach-omap1/mux.c
@@
-24,10
+24,11
@@
*/
#include <linux/module.h>
#include <linux/init.h>
-#include <asm/system.h>
-#include <asm/io.h>
+#include <linux/io.h>
#include <linux/spinlock.h>
+#include <asm/system.h>
+
#include <mach/mux.h>
#ifdef CONFIG_OMAP_MUX