diff options
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/menelaus.c | 2 | ||||
-rw-r--r-- | drivers/mfd/omap-usb-host.c | 5 | ||||
-rw-r--r-- | drivers/mfd/omap-usb-tll.c | 2 | ||||
-rw-r--r-- | drivers/mfd/omap-usb.h | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index 55d589981412..998ce8cb3065 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c | |||
@@ -41,11 +41,11 @@ | |||
41 | #include <linux/rtc.h> | 41 | #include <linux/rtc.h> |
42 | #include <linux/bcd.h> | 42 | #include <linux/bcd.h> |
43 | #include <linux/slab.h> | 43 | #include <linux/slab.h> |
44 | #include <linux/mfd/menelaus.h> | ||
44 | 45 | ||
45 | #include <asm/mach/irq.h> | 46 | #include <asm/mach/irq.h> |
46 | 47 | ||
47 | #include <asm/gpio.h> | 48 | #include <asm/gpio.h> |
48 | #include <plat/menelaus.h> | ||
49 | 49 | ||
50 | #define DRIVER_NAME "menelaus" | 50 | #define DRIVER_NAME "menelaus" |
51 | 51 | ||
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c index 23cec57c02ba..cebfe0a68aa7 100644 --- a/drivers/mfd/omap-usb-host.c +++ b/drivers/mfd/omap-usb-host.c | |||
@@ -26,9 +26,12 @@ | |||
26 | #include <linux/spinlock.h> | 26 | #include <linux/spinlock.h> |
27 | #include <linux/gpio.h> | 27 | #include <linux/gpio.h> |
28 | #include <plat/cpu.h> | 28 | #include <plat/cpu.h> |
29 | #include <plat/usb.h> | 29 | #include <linux/platform_device.h> |
30 | #include <linux/platform_data/usb-omap.h> | ||
30 | #include <linux/pm_runtime.h> | 31 | #include <linux/pm_runtime.h> |
31 | 32 | ||
33 | #include "omap-usb.h" | ||
34 | |||
32 | #define USBHS_DRIVER_NAME "usbhs_omap" | 35 | #define USBHS_DRIVER_NAME "usbhs_omap" |
33 | #define OMAP_EHCI_DEVICE "ehci-omap" | 36 | #define OMAP_EHCI_DEVICE "ehci-omap" |
34 | #define OMAP_OHCI_DEVICE "ohci-omap3" | 37 | #define OMAP_OHCI_DEVICE "ohci-omap3" |
diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c index 4b7757b84301..0db0dfa3d08c 100644 --- a/drivers/mfd/omap-usb-tll.c +++ b/drivers/mfd/omap-usb-tll.c | |||
@@ -25,8 +25,8 @@ | |||
25 | #include <linux/clk.h> | 25 | #include <linux/clk.h> |
26 | #include <linux/io.h> | 26 | #include <linux/io.h> |
27 | #include <linux/err.h> | 27 | #include <linux/err.h> |
28 | #include <plat/usb.h> | ||
29 | #include <linux/pm_runtime.h> | 28 | #include <linux/pm_runtime.h> |
29 | #include <linux/platform_data/usb-omap.h> | ||
30 | 30 | ||
31 | #define USBTLL_DRIVER_NAME "usbhs_tll" | 31 | #define USBTLL_DRIVER_NAME "usbhs_tll" |
32 | 32 | ||
diff --git a/drivers/mfd/omap-usb.h b/drivers/mfd/omap-usb.h new file mode 100644 index 000000000000..972aa961b064 --- /dev/null +++ b/drivers/mfd/omap-usb.h | |||
@@ -0,0 +1,2 @@ | |||
1 | extern int omap_tll_enable(void); | ||
2 | extern int omap_tll_disable(void); | ||