diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-03-03 14:18:08 -0500 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-03-03 14:18:08 -0500 |
| commit | 27710bf6febe8323f78bceca002ca7d71e5012a7 (patch) | |
| tree | 80a72f385ea28f9f7649363fe5147b3da37f9950 /include/linux/usb.h | |
| parent | 9ef64cb4320df821638b508f79aa8b858cca99f0 (diff) | |
| parent | cad226b8a71f969ad05137e43b48c9e6059a0b9f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/usb.h')
| -rw-r--r-- | include/linux/usb.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index 2372e2e6b527..5bd3ae8aaaf4 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
| @@ -781,8 +781,7 @@ static inline int usb_endpoint_is_isoc_out( | |||
| 781 | .idVendor = (vend), \ | 781 | .idVendor = (vend), \ |
| 782 | .idProduct = (prod) | 782 | .idProduct = (prod) |
| 783 | /** | 783 | /** |
| 784 | * USB_DEVICE_VER - macro used to describe a specific usb device with a | 784 | * USB_DEVICE_VER - describe a specific usb device with a version range |
| 785 | * version range | ||
| 786 | * @vend: the 16 bit USB Vendor ID | 785 | * @vend: the 16 bit USB Vendor ID |
| 787 | * @prod: the 16 bit USB Product ID | 786 | * @prod: the 16 bit USB Product ID |
| 788 | * @lo: the bcdDevice_lo value | 787 | * @lo: the bcdDevice_lo value |
| @@ -799,8 +798,7 @@ static inline int usb_endpoint_is_isoc_out( | |||
| 799 | .bcdDevice_hi = (hi) | 798 | .bcdDevice_hi = (hi) |
| 800 | 799 | ||
| 801 | /** | 800 | /** |
| 802 | * USB_DEVICE_INTERFACE_PROTOCOL - macro used to describe a usb | 801 | * USB_DEVICE_INTERFACE_PROTOCOL - describe a usb device with a specific interface protocol |
| 803 | * device with a specific interface protocol | ||
| 804 | * @vend: the 16 bit USB Vendor ID | 802 | * @vend: the 16 bit USB Vendor ID |
| 805 | * @prod: the 16 bit USB Product ID | 803 | * @prod: the 16 bit USB Product ID |
| 806 | * @pr: bInterfaceProtocol value | 804 | * @pr: bInterfaceProtocol value |
| @@ -846,8 +844,7 @@ static inline int usb_endpoint_is_isoc_out( | |||
| 846 | .bInterfaceProtocol = (pr) | 844 | .bInterfaceProtocol = (pr) |
| 847 | 845 | ||
| 848 | /** | 846 | /** |
| 849 | * USB_DEVICE_AND_INTERFACE_INFO - macro used to describe a specific usb device | 847 | * USB_DEVICE_AND_INTERFACE_INFO - describe a specific usb device with a class of usb interfaces |
| 850 | * with a class of usb interfaces | ||
| 851 | * @vend: the 16 bit USB Vendor ID | 848 | * @vend: the 16 bit USB Vendor ID |
| 852 | * @prod: the 16 bit USB Product ID | 849 | * @prod: the 16 bit USB Product ID |
| 853 | * @cl: bInterfaceClass value | 850 | * @cl: bInterfaceClass value |