diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 02:55:27 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 02:55:27 -0500 |
| commit | fb53fde9762432d091dac209bdf4f3f850117c55 (patch) | |
| tree | 607b09022b206a539cb4a924e4ef476443798252 /include/linux/usb | |
| parent | eb4400e3a040b90a3ad805b01fcbc99a5f615c8f (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/usb')
| -rw-r--r-- | include/linux/usb/cdc.h | 2 | ||||
| -rw-r--r-- | include/linux/usb/gadgetfs.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/usb/cdc.h b/include/linux/usb/cdc.h index 18a729343ffa..3c86ed25a04c 100644 --- a/include/linux/usb/cdc.h +++ b/include/linux/usb/cdc.h | |||
| @@ -9,6 +9,8 @@ | |||
| 9 | #ifndef __LINUX_USB_CDC_H | 9 | #ifndef __LINUX_USB_CDC_H |
| 10 | #define __LINUX_USB_CDC_H | 10 | #define __LINUX_USB_CDC_H |
| 11 | 11 | ||
| 12 | #include <linux/types.h> | ||
| 13 | |||
| 12 | #define USB_CDC_SUBCLASS_ACM 0x02 | 14 | #define USB_CDC_SUBCLASS_ACM 0x02 |
| 13 | #define USB_CDC_SUBCLASS_ETHERNET 0x06 | 15 | #define USB_CDC_SUBCLASS_ETHERNET 0x06 |
| 14 | #define USB_CDC_SUBCLASS_WHCM 0x08 | 16 | #define USB_CDC_SUBCLASS_WHCM 0x08 |
diff --git a/include/linux/usb/gadgetfs.h b/include/linux/usb/gadgetfs.h index ea45f265ec05..612102e4d75e 100644 --- a/include/linux/usb/gadgetfs.h +++ b/include/linux/usb/gadgetfs.h | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #ifndef __LINUX_USB_GADGETFS_H | 18 | #ifndef __LINUX_USB_GADGETFS_H |
| 19 | #define __LINUX_USB_GADGETFS_H | 19 | #define __LINUX_USB_GADGETFS_H |
| 20 | 20 | ||
| 21 | #include <asm/types.h> | 21 | #include <linux/types.h> |
| 22 | #include <asm/ioctl.h> | 22 | #include <asm/ioctl.h> |
| 23 | 23 | ||
| 24 | #include <linux/usb/ch9.h> | 24 | #include <linux/usb/ch9.h> |