patch-2.4.0-test11 linux/drivers/usb/serial/usb-serial.h

Next file: linux/drivers/usb/serial/usbserial.c
Previous file: linux/drivers/usb/serial/omninet.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test10/linux/drivers/usb/serial/usb-serial.h linux/drivers/usb/serial/usb-serial.h
@@ -112,8 +112,7 @@
 /* This structure defines the individual serial converter. */
 struct usb_serial_device_type {
 	char	*name;
-	__u16	*idVendor;
-	__u16	*idProduct;
+	const struct usb_device_id *id_table;
 	char	needs_interrupt_in;
 	char	needs_bulk_in;
 	char	needs_bulk_out;
@@ -125,7 +124,9 @@
 	struct list_head	driver_list;
 	
 	/* function call to make before accepting driver */
-	int (*startup) (struct usb_serial *serial);	/* return 0 to continue initialization, anything else to abort */
+	/* return 0 to continue initialization, anything else to abort */
+	int (*startup) (struct usb_serial *serial);
+	
 	void (*shutdown) (struct usb_serial *serial);
 
 	/* serial function calls */

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