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 /arch/arm/mach-omap2/usb-tusb6010.c | |
| parent | 49ea7fc094162fcaa83f5876b2090c816cc4498c (diff) | |
| parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
Merge branch 'omap/headers4' into next/cleanup
Diffstat (limited to 'arch/arm/mach-omap2/usb-tusb6010.c')
| -rw-r--r-- | arch/arm/mach-omap2/usb-tusb6010.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c index 805bea6edf17..a8795ff19e6d 100644 --- a/arch/arm/mach-omap2/usb-tusb6010.c +++ b/arch/arm/mach-omap2/usb-tusb6010.c | |||
| @@ -15,10 +15,11 @@ | |||
| 15 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
| 16 | #include <linux/gpio.h> | 16 | #include <linux/gpio.h> |
| 17 | #include <linux/export.h> | 17 | #include <linux/export.h> |
| 18 | #include <linux/platform_data/usb-omap.h> | ||
| 18 | 19 | ||
| 19 | #include <linux/usb/musb.h> | 20 | #include <linux/usb/musb.h> |
| 20 | 21 | ||
| 21 | #include <plat/gpmc.h> | 22 | #include "gpmc.h" |
| 22 | 23 | ||
| 23 | #include "mux.h" | 24 | #include "mux.h" |
| 24 | 25 | ||