summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <greg@kroah.com>2003-01-14 22:46:54 -0800
committerGreg Kroah-Hartman <greg@kroah.com>2003-01-14 22:46:54 -0800
commit078dfbd23e8ee1452f6fcc962afdceaa2754be14 (patch)
tree12106c06d3446bb404a7274373782ea2c0dc432a /include
parentbae9a1941b59f70c765b84e94347528083021866 (diff)
parent0f33aaa117505dddfc948175ac9caa779468e545 (diff)
Merge kroah.com:/home/linux/linux/BK/bleeding-2.5
into kroah.com:/home/linux/linux/BK/gregkh-2.5
Diffstat (limited to 'include')
-rw-r--r--include/linux/usb.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h
index bcbfa72423c3..9f465bfd8179 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -277,7 +277,9 @@ extern void usb_driver_release_interface(struct usb_driver *driver,
const struct usb_device_id *usb_match_id(struct usb_interface *interface,
const struct usb_device_id *id);
-struct usb_interface *usb_find_interface(struct usb_driver *drv, kdev_t kdev);
+extern struct usb_interface *usb_find_interface(struct usb_driver *drv, kdev_t kdev);
+extern struct usb_interface *usb_ifnum_to_if(struct usb_device *dev, unsigned ifnum);
+
/**
* usb_make_path - returns stable device path in the usb tree