Merge http://linux-isdn.bkbits.net/linux-2.5.make-usb

into kroah.com:/home/linux/linux/BK/work-2.5

1 files changed, 3 insertions, 0 deletions

diff --git a/include/linux/usb.h b/include/linux/usb.h
index f06fafb62ee1..06a3f5c09e66 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -493,6 +493,8 @@ struct usb_device_id {
  * @minor: Used with fops to simplify creating USB character devices.
  *	Such drivers have sixteen character devices, using the USB
  *	major number and starting with this minor number.
+ * @num_minors: Used with minor to specify how many minors are used by
+ *	this driver.
  * @ioctl: Used for drivers that want to talk to userspace through
  *	the "usbfs" filesystem.  This lets devices provide ways to
  *	expose information to user space regardless of where they
@@ -534,6 +536,7 @@ struct usb_driver {
 
 	struct file_operations *fops;
 	int minor;
+	int num_minors;
 
 	struct semaphore serialize;