diff --git a/[refs] b/[refs] index 70a6c42a1f9a..1b504f058c13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8485f8c9652b226726827e61fb43647bf22e691f +refs/heads/master: f939484bb6473e51c1516ab9a4f3a7620cd95d72 diff --git a/trunk/drivers/usb/serial/ipw.c b/trunk/drivers/usb/serial/ipw.c index 27b8886f1055..76a06406e26a 100644 --- a/trunk/drivers/usb/serial/ipw.c +++ b/trunk/drivers/usb/serial/ipw.c @@ -333,25 +333,7 @@ static struct usb_serial_driver * const serial_drivers[] = { &ipw_device, NULL }; - -static int __init usb_ipw_init(void) -{ - int retval; - - retval = usb_serial_register_drivers(&usb_ipw_driver, serial_drivers); - if (retval == 0) - printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" - DRIVER_DESC "\n"); - return retval; -} - -static void __exit usb_ipw_exit(void) -{ - usb_serial_deregister_drivers(&usb_ipw_driver, serial_drivers); -} - -module_init(usb_ipw_init); -module_exit(usb_ipw_exit); +module_usb_serial_driver(usb_ipw_driver, serial_drivers); /* Module information */ MODULE_AUTHOR(DRIVER_AUTHOR);