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 branch 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
mux.c
diff --git
a/arch/arm/mach-omap2/mux.c
b/arch/arm/mach-omap2/mux.c
index
8f98b20
..
443d07f
100644
(file)
--- a/
arch/arm/mach-omap2/mux.c
+++ b/
arch/arm/mach-omap2/mux.c
@@
-29,8
+29,8
@@
#include <asm/io.h>
#include <linux/spinlock.h>
-#include <
asm/ar
ch/control.h>
-#include <
asm/ar
ch/mux.h>
+#include <
ma
ch/control.h>
+#include <
ma
ch/mux.h>
#ifdef CONFIG_OMAP_MUX