diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2004-01-26 22:50:05 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2004-01-26 22:50:05 -0800 |
| commit | 959ab1dc46b4ae87bc7d19b8602c42862542fc04 (patch) | |
| tree | 0a065ffde6a52453b91c0d042404af1f14812e8f /include/linux | |
| parent | 01477f1cd26768296f4c19c2d1592f8c3b97d9f1 (diff) | |
| parent | 6afd205508a28c2a40c1e7747235d2bc2065ed02 (diff) | |
Merge kroah.com:/home/greg/linux/BK/bleed-2.5
into kroah.com:/home/greg/linux/BK/usb-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/usb.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index 5e49f861230d..c405f81be765 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -856,7 +856,6 @@ extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe, /* wrappers around usb_control_msg() for the most common standard requests */ extern int usb_get_descriptor(struct usb_device *dev, unsigned char desctype, unsigned char descindex, void *buf, int size); -extern int usb_get_device_descriptor(struct usb_device *dev); extern int usb_get_status(struct usb_device *dev, int type, int target, void *data); extern int usb_get_string(struct usb_device *dev, |