diff options
| author | Olof Johansson | 2012-11-05 19:27:09 +0100 |
|---|---|---|
| committer | Olof Johansson | 2012-11-05 19:27:33 +0100 |
| commit | 365480d67bfa6a3205708d20035abee4d422ee5b (patch) | |
| tree | e58aba813aa1d040b98355325459ec8ad1c6a4e6 /drivers/usb/host | |
| parent | Merge tag 'omap-for-v3.8/cleanup-headers-serial-take2-signed' of git://git.ke... (diff) | |
| parent | ARM: OMAP: move OMAP USB platform data to <linux/platform_data/omap-usb.h> (diff) | |
| download | kernel-qcow2-linux-365480d67bfa6a3205708d20035abee4d422ee5b.tar.gz kernel-qcow2-linux-365480d67bfa6a3205708d20035abee4d422ee5b.tar.xz kernel-qcow2-linux-365480d67bfa6a3205708d20035abee4d422ee5b.zip | |
Merge branch 'depends/omap-cleanup-headers-usb' into next/headers
Conflicts resolved same as Tony did in his later dependent branch:
arch/arm/mach-omap1/clock.c
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-cm-t35.c
arch/arm/mach-omap2/board-igep0020.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3logic.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/board-rm680.c
arch/arm/mach-omap2/board-rx51.c
arch/arm/mach-omap2/twl-common.c
arch/arm/mach-omap2/usb-host.c
arch/arm/mach-omap2/usb-musb.c
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/ehci-omap.c | 3 | ||||
| -rw-r--r-- | drivers/usb/host/ohci-omap3.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index d7fe287d0678..0d5ac36fdf47 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -39,12 +39,13 @@ #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/usb/ulpi.h> -#include <plat/usb.h> #include <linux/regulator/consumer.h> #include <linux/pm_runtime.h> #include <linux/gpio.h> #include <linux/clk.h> +#include <linux/platform_data/usb-omap.h> + /* EHCI Register Set */ #define EHCI_INSNREG04 (0xA0) #define EHCI_INSNREG04_DISABLE_UNSUSPEND (1 << 5) diff --git a/drivers/usb/host/ohci-omap3.c b/drivers/usb/host/ohci-omap3.c index 1b8133b6e451..bd7803dce9be 100644 --- a/drivers/usb/host/ohci-omap3.c +++ b/drivers/usb/host/ohci-omap3.c @@ -30,7 +30,6 @@ */ #include <linux/platform_device.h> -#include <plat/usb.h> #include <linux/pm_runtime.h> /*-------------------------------------------------------------------------*/ |