diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-02-03 10:51:52 -0500 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-02-03 10:51:52 -0500 |
commit | ed7b44af3517441ba46b84da13773d24809ffdd3 (patch) | |
tree | 7064703c5d63d44700085cd701703457730bc06e /include/linux/usb/cdc.h | |
parent | a1a1415e5ea2d2241df208a7777a4f38aba9ed5a (diff) | |
parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/usb/cdc.h')
-rw-r--r-- | include/linux/usb/cdc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/usb/cdc.h b/include/linux/usb/cdc.h index 18a729343ff..3c86ed25a04 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 |