diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 11:06:24 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 11:06:24 -0500 |
| commit | 9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1 (patch) | |
| tree | d8c434ea98ee541ee17f4df87bb8e9020ce29b98 /drivers/usb/host/ehci-omap.c | |
| parent | 49ea7fc094162fcaa83f5876b2090c816cc4498c (diff) | |
| parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
Merge branch 'omap/headers4' into next/cleanup
Diffstat (limited to 'drivers/usb/host/ehci-omap.c')
| -rw-r--r-- | drivers/usb/host/ehci-omap.c | 3 |
1 files changed, 2 insertions, 1 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 @@ | |||
| 39 | #include <linux/platform_device.h> | 39 | #include <linux/platform_device.h> |
| 40 | #include <linux/slab.h> | 40 | #include <linux/slab.h> |
| 41 | #include <linux/usb/ulpi.h> | 41 | #include <linux/usb/ulpi.h> |
| 42 | #include <plat/usb.h> | ||
| 43 | #include <linux/regulator/consumer.h> | 42 | #include <linux/regulator/consumer.h> |
| 44 | #include <linux/pm_runtime.h> | 43 | #include <linux/pm_runtime.h> |
| 45 | #include <linux/gpio.h> | 44 | #include <linux/gpio.h> |
| 46 | #include <linux/clk.h> | 45 | #include <linux/clk.h> |
| 47 | 46 | ||
| 47 | #include <linux/platform_data/usb-omap.h> | ||
| 48 | |||
| 48 | /* EHCI Register Set */ | 49 | /* EHCI Register Set */ |
| 49 | #define EHCI_INSNREG04 (0xA0) | 50 | #define EHCI_INSNREG04 (0xA0) |
| 50 | #define EHCI_INSNREG04_DISABLE_UNSUSPEND (1 << 5) | 51 | #define EHCI_INSNREG04_DISABLE_UNSUSPEND (1 << 5) |