diff options
| author | David S. Miller <davem@cheetah.(none)> | 2004-01-28 18:57:39 -0800 |
|---|---|---|
| committer | David S. Miller <davem@cheetah.(none)> | 2004-01-28 18:57:39 -0800 |
| commit | ad3258ed7380a7eadeb18ab8c9c595846a54b551 (patch) | |
| tree | 2615234ff094ff7cb78a004749aa4f131dd328ca /include/linux | |
| parent | 89a5508e982afdd6e5eca6b5609245363ed42982 (diff) | |
| parent | e878a1dd052c69468e148884f675021491175a81 (diff) | |
Merge cheetah.(none):/home/davem/src/BK/sparcwork-2.6
into cheetah.(none):/home/davem/src/BK/sparc-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, |