Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[karo-tx-linux.git] / drivers / hid / usbhid / usbkbd.c

diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c
index a7b925aeaf2e08aaf1613fcec8588184fc16eca3..796086980f4a622dfe2857eec1d00ff33cdff787 100644 (file)
--- a/drivers/hid/usbhid/usbkbd.c
+++ b/drivers/hid/usbhid/usbkbd.c
@@ -408,19 +408,4 @@ static struct usb_driver usb_kbd_driver = {
        .id_table =     usb_kbd_id_table,
 };
 
-static int __init usb_kbd_init(void)
-{
-       int result = usb_register(&usb_kbd_driver);
-       if (result == 0)
-               printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-                               DRIVER_DESC "\n");
-       return result;
-}
-
-static void __exit usb_kbd_exit(void)
-{
-       usb_deregister(&usb_kbd_driver);
-}
-
-module_init(usb_kbd_init);
-module_exit(usb_kbd_exit);
+module_usb_driver(usb_kbd_driver);