From: Andrew Morton Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/usb/serial/io_tables.h | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff -puN drivers/usb/serial/io_tables.h~gregkh-usb-usb-serial-driver-cleanup-04-fixes drivers/usb/serial/io_tables.h --- devel/drivers/usb/serial/io_tables.h~gregkh-usb-usb-serial-driver-cleanup-04-fixes 2005-10-23 19:53:51.000000000 -0700 +++ devel-akpm/drivers/usb/serial/io_tables.h 2005-10-23 19:54:57.000000000 -0700 @@ -76,9 +76,11 @@ static struct usb_device_id id_table_com MODULE_DEVICE_TABLE (usb, id_table_combined); static struct usb_serial_driver edgeport_2port_device = { - .owner = THIS_MODULE, - .name = "Edgeport 2 port adapter", - .short_name = "edgeport_2", + .driver = { + .owner = THIS_MODULE, + .name = "Edgeport 2 port adapter", + }, + .description = "edgeport_2", .id_table = edgeport_2port_id_table, .num_interrupt_in = 1, .num_bulk_in = 1, @@ -104,9 +106,11 @@ static struct usb_serial_driver edgeport }; static struct usb_serial_driver edgeport_4port_device = { - .owner = THIS_MODULE, - .name = "Edgeport 4 port adapter", - .short_name = "edgeport_4", + .driver = { + .owner = THIS_MODULE, + .name = "Edgeport 4 port adapter", + }, + .description = "edgeport_4", .id_table = edgeport_4port_id_table, .num_interrupt_in = 1, .num_bulk_in = 1, @@ -132,9 +136,11 @@ static struct usb_serial_driver edgeport }; static struct usb_serial_driver edgeport_8port_device = { - .owner = THIS_MODULE, - .name = "Edgeport 8 port adapter", - .short_name = "edgeport_8", + .driver = { + .owner = THIS_MODULE, + .name = "Edgeport 8 port adapter", + }, + .description = "edgeport_8", .id_table = edgeport_8port_id_table, .num_interrupt_in = 1, .num_bulk_in = 1, _