diff options
| author | Olof Johansson <olof@lixom.net> | 2012-12-13 01:09:22 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-12-13 01:10:00 +0100 |
| commit | 4a76411ea3f1da9032e031f8fff8894b97d141b2 (patch) | |
| tree | 59976175d70b6e08aacd4abf7090919d3b78fc29 /arch/arm/mach-omap2/omap_phy_internal.c | |
| parent | Merge branch 'next/pm-samsung' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | Merge tag 'omap-for-v3.8/clock-signed' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| download | linux-4a76411ea3f1da9032e031f8fff8894b97d141b2.tar.xz linux-4a76411ea3f1da9032e031f8fff8894b97d141b2.zip | |
ARM: arm-soc: Merge branch 'next/clk' into next/pm
Merge together a couple of the smaller pm/clock branches into one.
Signed-off-by: Olof Johansson <olof@lixom.net>
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 9b56e5e1a2d2..e237602e10ea 100644 --- a/arch/arm/mach-omap2/omap_phy_internal.c +++ b/arch/arm/mach-omap2/omap_phy_internal.c @@ -27,11 +27,11 @@ #include <linux/io.h> #include <linux/err.h> #include <linux/usb.h> - -#include <plat/usb.h> +#include <linux/usb/musb.h> #include "soc.h" #include "control.h" +#include "usb.h" #define CONTROL_DEV_CONF 0x300 #define PHY_PD 0x1 |