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-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap2
/
mux.c
diff --git
a/arch/arm/mach-omap2/mux.c
b/arch/arm/mach-omap2/mux.c
index
701e17c
..
2612634
100644
(file)
--- a/
arch/arm/mach-omap2/mux.c
+++ b/
arch/arm/mach-omap2/mux.c
@@
-36,8
+36,9
@@
#include <linux/interrupt.h>
-#include
<plat/omap_hwmod.h>
+#include
"omap_hwmod.h"
+#include "soc.h"
#include "control.h"
#include "mux.h"
#include "prm.h"