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 'bkl-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
usb-musb.c
diff --git
a/arch/arm/mach-omap2/usb-musb.c
b/arch/arm/mach-omap2/usb-musb.c
index 1145a2562b0f7fc9620793a34a526bdc4878f2b1..a80441dd19b89367e9d67691d656ace1bbb4349d 100644
(file)
--- a/
arch/arm/mach-omap2/usb-musb.c
+++ b/
arch/arm/mach-omap2/usb-musb.c
@@
-28,8
+28,8
@@
#include <mach/hardware.h>
#include <mach/irqs.h>
-#include <
mach
/mux.h>
-#include <
mach
/usb.h>
+#include <
plat
/mux.h>
+#include <
plat
/usb.h>
#ifdef CONFIG_USB_MUSB_SOC