diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-09 17:54:17 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-09 17:54:17 -0500 |
| commit | f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37 (patch) | |
| tree | a9ce4f46ea3b2e516698b2c3817e40414a8bbf51 /arch/arm/mach-omap2/omap_phy_internal.c | |
| parent | 84fbd2b8c8da49b4e53fcb484a1564a9b5da61b3 (diff) | |
| parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt
Conflicts:
arch/arm/plat-omap/dmtimer.c
Resolved as suggested by Jon Hunter.
Diffstat (limited to 'arch/arm/mach-omap2/omap_phy_internal.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_phy_internal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c index d992db8ff0b0..4d76a3ca5bf3 100644 --- a/arch/arm/mach-omap2/omap_phy_internal.c +++ b/arch/arm/mach-omap2/omap_phy_internal.c | |||
| @@ -27,11 +27,11 @@ | |||
| 27 | #include <linux/io.h> | 27 | #include <linux/io.h> |
| 28 | #include <linux/err.h> | 28 | #include <linux/err.h> |
| 29 | #include <linux/usb.h> | 29 | #include <linux/usb.h> |
| 30 | 30 | #include <linux/usb/musb.h> | |
| 31 | #include <plat/usb.h> | ||
| 32 | 31 | ||
| 33 | #include "soc.h" | 32 | #include "soc.h" |
| 34 | #include "control.h" | 33 | #include "control.h" |
| 34 | #include "usb.h" | ||
| 35 | 35 | ||
| 36 | void am35x_musb_reset(void) | 36 | void am35x_musb_reset(void) |
| 37 | { | 37 | { |