patch-2.4.0-prerelease linux/drivers/usb/storage/usb.c

Next file: linux/drivers/usb/usb.c
Previous file: linux/drivers/usb/storage/scsiglue.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test12/linux/drivers/usb/storage/usb.c linux/drivers/usb/storage/usb.c
@@ -93,7 +93,8 @@
 struct us_data *us_list;
 struct semaphore us_list_semaphore;
 
-static void * storage_probe(struct usb_device *dev, unsigned int ifnum);
+static void * storage_probe(struct usb_device *dev, unsigned int ifnum,
+			    const struct usb_device_id *id);
 static void storage_disconnect(struct usb_device *dev, void *ptr);
 struct usb_driver usb_storage_driver = {
 	name:		"usb-storage",
@@ -615,7 +616,8 @@
 }
 
 /* Probe to see if a new device is actually a SCSI device */
-static void * storage_probe(struct usb_device *dev, unsigned int ifnum)
+static void * storage_probe(struct usb_device *dev, unsigned int ifnum,
+			    const struct usb_device_id *id)
 {
 	int i;
 	char mf[USB_STOR_STRING_LEN];		     /* manufacturer */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)