diff --git a/[refs] b/[refs] index 9f3d6f14ce5d..99d49a69d3e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e8ad0dca9bbd9724ffa395b9ab425c4f22e1346 +refs/heads/master: 7dcb582cd4b0c67e0053fbb87706bd0922d79027 diff --git a/trunk/drivers/staging/comedi/drivers/usbduxfast.c b/trunk/drivers/staging/comedi/drivers/usbduxfast.c index c6d34703a344..861d8989a491 100644 --- a/trunk/drivers/staging/comedi/drivers/usbduxfast.c +++ b/trunk/drivers/staging/comedi/drivers/usbduxfast.c @@ -1826,7 +1826,7 @@ static comedi_driver driver_usbduxfast = { .detach = usbduxfast_detach }; -static void init_usb_devices(void) +static void __init init_usb_devices(void) { int index; @@ -1875,7 +1875,7 @@ static struct usb_driver usbduxfastsub_driver = { * Can't use the nice macro as I have also to initialise the USB subsystem: * registering the usb-system _and_ the comedi-driver */ -static int init_usbduxfast(void) +static int __init init_usbduxfast(void) { printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" DRIVER_DESC "\n"); @@ -1888,7 +1888,7 @@ static int init_usbduxfast(void) /* * deregistering the comedi driver and the usb-subsystem */ -static void exit_usbduxfast(void) +static void __exit exit_usbduxfast(void) { comedi_driver_unregister(&driver_usbduxfast); usb_deregister(&usbduxfastsub_driver);