diff options
| -rw-r--r-- | arch/arm/plat-omap/usb.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/chips/isp1301_omap.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/omap_udc.c | 2 | ||||
| -rw-r--r-- | drivers/usb/host/ohci-hcd.c | 2 | ||||
| -rw-r--r-- | include/linux/usb/otg.h (renamed from include/linux/usb_otg.h) | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c index 9b815327b6a5..7e8096809be2 100644 --- a/arch/arm/plat-omap/usb.c +++ b/arch/arm/plat-omap/usb.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include <linux/errno.h> | 26 | #include <linux/errno.h> |
| 27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 28 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
| 29 | #include <linux/usb_otg.h> | 29 | #include <linux/usb/otg.h> |
| 30 | 30 | ||
| 31 | #include <asm/io.h> | 31 | #include <asm/io.h> |
| 32 | #include <asm/irq.h> | 32 | #include <asm/irq.h> |
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c index f92505b94c61..182f04953466 100644 --- a/drivers/i2c/chips/isp1301_omap.c +++ b/drivers/i2c/chips/isp1301_omap.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include <linux/usb_ch9.h> | 30 | #include <linux/usb_ch9.h> |
| 31 | #include <linux/usb_gadget.h> | 31 | #include <linux/usb_gadget.h> |
| 32 | #include <linux/usb.h> | 32 | #include <linux/usb.h> |
| 33 | #include <linux/usb_otg.h> | 33 | #include <linux/usb/otg.h> |
| 34 | #include <linux/i2c.h> | 34 | #include <linux/i2c.h> |
| 35 | #include <linux/workqueue.h> | 35 | #include <linux/workqueue.h> |
| 36 | 36 | ||
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index 2de9748ee673..81f0389fcc94 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | #include <linux/platform_device.h> | 40 | #include <linux/platform_device.h> |
| 41 | #include <linux/usb_ch9.h> | 41 | #include <linux/usb_ch9.h> |
| 42 | #include <linux/usb_gadget.h> | 42 | #include <linux/usb_gadget.h> |
| 43 | #include <linux/usb_otg.h> | 43 | #include <linux/usb/otg.h> |
| 44 | #include <linux/dma-mapping.h> | 44 | #include <linux/dma-mapping.h> |
| 45 | 45 | ||
| 46 | #include <asm/byteorder.h> | 46 | #include <asm/byteorder.h> |
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index cbf38ae5ae76..7c3d8c60a60f 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c | |||
| @@ -88,7 +88,7 @@ | |||
| 88 | #include <linux/timer.h> | 88 | #include <linux/timer.h> |
| 89 | #include <linux/list.h> | 89 | #include <linux/list.h> |
| 90 | #include <linux/usb.h> | 90 | #include <linux/usb.h> |
| 91 | #include <linux/usb_otg.h> | 91 | #include <linux/usb/otg.h> |
| 92 | #include <linux/dma-mapping.h> | 92 | #include <linux/dma-mapping.h> |
| 93 | #include <linux/dmapool.h> | 93 | #include <linux/dmapool.h> |
| 94 | #include <linux/reboot.h> | 94 | #include <linux/reboot.h> |
diff --git a/include/linux/usb_otg.h b/include/linux/usb/otg.h index f827f6e203c2..9897f7a818c5 100644 --- a/include/linux/usb_otg.h +++ b/include/linux/usb/otg.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | // include/linux/usb_otg.h | 1 | // include/linux/usb/otg.h |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * These APIs may be used between USB controllers. USB device drivers | 4 | * These APIs may be used between USB controllers. USB device drivers |
| @@ -52,7 +52,7 @@ struct otg_transceiver { | |||
| 52 | u16 port_change; | 52 | u16 port_change; |
| 53 | 53 | ||
| 54 | /* bind/unbind the host controller */ | 54 | /* bind/unbind the host controller */ |
| 55 | int (*set_host)(struct otg_transceiver *otg, | 55 | int (*set_host)(struct otg_transceiver *otg, |
| 56 | struct usb_bus *host); | 56 | struct usb_bus *host); |
| 57 | 57 | ||
| 58 | /* bind/unbind the peripheral controller */ | 58 | /* bind/unbind the peripheral controller */ |