summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@penguin.transmeta.com>2002-05-30 20:39:23 -0700
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-05-30 20:39:23 -0700
commit4229408522cd66fb2e5edef5ad550e88e45aca99 (patch)
treec18aa805674c78bfc05f627d642ae36f08c04630 /include/linux
parentcdf24f56978fd172bb803b8d50ba150c5afca566 (diff)
parentc1f4224ed55f6f01703cac2b8c1915dd1445422c (diff)
Merge http://linuxusb.bkbits.net/linus-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/usb.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h
index df2c764dec66..d31eb7e942b3 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -713,6 +713,8 @@ struct usb_driver {
/* void (*resume)(struct usb_device *dev); */
};
+extern struct bus_type usb_bus_type;
+
/*
* use these in module_init()/module_exit()
* and don't forget MODULE_DEVICE_TABLE(usb, ...)