diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-25 16:20:10 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-25 16:20:10 -0400 |
| commit | 404e86e1550cc2c84bb57a372af784585c732f9a (patch) | |
| tree | c0e8e2d61c1b1c79705c0dc9f0f16e35267286e4 /include/linux/usb/cdc.h | |
| parent | 0206e61b467fde4d7b50f1a64355182a4fd9576b (diff) | |
| parent | b9fa38f75ea7e1f64bc29653ca9758303ce698e4 (diff) | |
Merge branch 'master' of /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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/usb/cdc.h b/include/linux/usb/cdc.h index 94ee4ecf0564..71e52f2f6a38 100644 --- a/include/linux/usb/cdc.h +++ b/include/linux/usb/cdc.h | |||
| @@ -6,6 +6,9 @@ | |||
| 6 | * firmware based USB peripherals. | 6 | * firmware based USB peripherals. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #ifndef __LINUX_USB_CDC_H | ||
| 10 | #define __LINUX_USB_CDC_H | ||
| 11 | |||
| 9 | #define USB_CDC_SUBCLASS_ACM 0x02 | 12 | #define USB_CDC_SUBCLASS_ACM 0x02 |
| 10 | #define USB_CDC_SUBCLASS_ETHERNET 0x06 | 13 | #define USB_CDC_SUBCLASS_ETHERNET 0x06 |
| 11 | #define USB_CDC_SUBCLASS_WHCM 0x08 | 14 | #define USB_CDC_SUBCLASS_WHCM 0x08 |
| @@ -221,3 +224,4 @@ struct usb_cdc_notification { | |||
| 221 | __le16 wLength; | 224 | __le16 wLength; |
| 222 | } __attribute__ ((packed)); | 225 | } __attribute__ ((packed)); |
| 223 | 226 | ||
| 227 | #endif /* __LINUX_USB_CDC_H */ | ||