diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-31 18:56:23 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-31 18:56:23 -0500 |
| commit | 45c82b5a770be66845687a7d027c8b52946d59af (patch) | |
| tree | 9385e15d13409e39d6f43805f8e7fa20430ca57e /include/linux/usb/cdc.h | |
| parent | 1347e965f5bcfffe82e56d2903ea4f32babaff4e (diff) | |
| parent | 7cff3608d2553a045b676fa81b0cf54e4f2cc5ce (diff) | |
Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (90 commits)
headers_check fix: x86, swab.h
headers_check fix: x86, sigcontext32.h
headers_check fix: x86, sigcontext.h
headers_check fix: x86, ptrace-abi.h
headers_check fix: x86, mtrr.h
headers_check fix: x86, mce.h
headers_check fix: x86, kvm.h
headers_check fix: x86, e820.h
headers_check fix: linux/rtnetlink.h
headers_check fix: linux/nubus.h
headers_check fix: video/uvesafb.h
headers_check fix: video/sisfb.h
headers_check fix: sound/hdsp.h
headers_check fix: mtd/inftl-user.h
headers_check fix: linux/virtio_net.h
headers_check fix: linux/virtio_console.h
headers_check fix: linux/virtio_blk.h
headers_check fix: linux/videodev.h
headers_check fix: linux/video_encoder.h
headers_check fix: linux/video_decoder.h
...
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 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 |
