summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@penguin.transmeta.com>2003-01-14 23:29:54 -0800
committerLinus Torvalds <torvalds@penguin.transmeta.com>2003-01-14 23:29:54 -0800
commit71a17fca74e1144e6761b20ed8a019083b0822e8 (patch)
tree24006a43ae670afdb5d9c57ea9d2ce7fc4b97ea0 /include
parent7da8fe563d408030272f57c740605ddb7563c281 (diff)
parentd2c445231a214bf44e2e94719a33b9890adc3d96 (diff)
Merge bk://linuxusb.bkbits.net/linus-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
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