diff options
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/ether.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/serial.c | 2 | ||||
| -rw-r--r-- | drivers/usb/net/cdc_ether.c | 2 | ||||
| -rw-r--r-- | drivers/usb/net/rndis_host.c | 2 | ||||
| -rw-r--r-- | drivers/usb/net/zaurus.c | 2 | ||||
| -rw-r--r-- | include/linux/usb/cdc.h (renamed from include/linux/usb_cdc.h) | 0 |
7 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 506aff60dac5..d41dc67ba4cc 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
| @@ -63,7 +63,7 @@ | |||
| 63 | #include <linux/mutex.h> | 63 | #include <linux/mutex.h> |
| 64 | #include <asm/uaccess.h> | 64 | #include <asm/uaccess.h> |
| 65 | #include <linux/usb.h> | 65 | #include <linux/usb.h> |
| 66 | #include <linux/usb_cdc.h> | 66 | #include <linux/usb/cdc.h> |
| 67 | #include <asm/byteorder.h> | 67 | #include <asm/byteorder.h> |
| 68 | #include <asm/unaligned.h> | 68 | #include <asm/unaligned.h> |
| 69 | #include <linux/list.h> | 69 | #include <linux/list.h> |
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index fc4684096fcc..078daa026718 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c | |||
| @@ -49,7 +49,7 @@ | |||
| 49 | #include <asm/unaligned.h> | 49 | #include <asm/unaligned.h> |
| 50 | 50 | ||
| 51 | #include <linux/usb_ch9.h> | 51 | #include <linux/usb_ch9.h> |
| 52 | #include <linux/usb_cdc.h> | 52 | #include <linux/usb/cdc.h> |
| 53 | #include <linux/usb_gadget.h> | 53 | #include <linux/usb_gadget.h> |
| 54 | 54 | ||
| 55 | #include <linux/random.h> | 55 | #include <linux/random.h> |
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c index e477edd681d3..9d6e1d295528 100644 --- a/drivers/usb/gadget/serial.c +++ b/drivers/usb/gadget/serial.c | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | #include <asm/uaccess.h> | 45 | #include <asm/uaccess.h> |
| 46 | 46 | ||
| 47 | #include <linux/usb_ch9.h> | 47 | #include <linux/usb_ch9.h> |
| 48 | #include <linux/usb_cdc.h> | 48 | #include <linux/usb/cdc.h> |
| 49 | #include <linux/usb_gadget.h> | 49 | #include <linux/usb_gadget.h> |
| 50 | 50 | ||
| 51 | #include "gadget_chips.h" | 51 | #include "gadget_chips.h" |
diff --git a/drivers/usb/net/cdc_ether.c b/drivers/usb/net/cdc_ether.c index 9c6c5b0b01ad..efd195b5912c 100644 --- a/drivers/usb/net/cdc_ether.c +++ b/drivers/usb/net/cdc_ether.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <linux/workqueue.h> | 31 | #include <linux/workqueue.h> |
| 32 | #include <linux/mii.h> | 32 | #include <linux/mii.h> |
| 33 | #include <linux/usb.h> | 33 | #include <linux/usb.h> |
| 34 | #include <linux/usb_cdc.h> | 34 | #include <linux/usb/cdc.h> |
| 35 | 35 | ||
| 36 | #include "usbnet.h" | 36 | #include "usbnet.h" |
| 37 | 37 | ||
diff --git a/drivers/usb/net/rndis_host.c b/drivers/usb/net/rndis_host.c index 94ddfe16fdda..f551546d7521 100644 --- a/drivers/usb/net/rndis_host.c +++ b/drivers/usb/net/rndis_host.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include <linux/workqueue.h> | 30 | #include <linux/workqueue.h> |
| 31 | #include <linux/mii.h> | 31 | #include <linux/mii.h> |
| 32 | #include <linux/usb.h> | 32 | #include <linux/usb.h> |
| 33 | #include <linux/usb_cdc.h> | 33 | #include <linux/usb/cdc.h> |
| 34 | 34 | ||
| 35 | #include "usbnet.h" | 35 | #include "usbnet.h" |
| 36 | 36 | ||
diff --git a/drivers/usb/net/zaurus.c b/drivers/usb/net/zaurus.c index bf2035d329f4..813e470d0600 100644 --- a/drivers/usb/net/zaurus.c +++ b/drivers/usb/net/zaurus.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include <linux/mii.h> | 30 | #include <linux/mii.h> |
| 31 | #include <linux/crc32.h> | 31 | #include <linux/crc32.h> |
| 32 | #include <linux/usb.h> | 32 | #include <linux/usb.h> |
| 33 | #include <linux/usb_cdc.h> | 33 | #include <linux/usb/cdc.h> |
| 34 | 34 | ||
| 35 | #include "usbnet.h" | 35 | #include "usbnet.h" |
| 36 | 36 | ||
diff --git a/include/linux/usb_cdc.h b/include/linux/usb/cdc.h index ba617c372455..ba617c372455 100644 --- a/include/linux/usb_cdc.h +++ b/include/linux/usb/cdc.h | |||