From add53f67cdab4c556399678ccc0a059d3d9a943d Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 18 Nov 2011 09:49:34 -0800
Subject: [PATCH] --- yaml --- r: 280039 b: refs/heads/master c:
 42f06a13445bffae96c5e42fdd721ef65fed6abf h: refs/heads/master i:   280037:
 5cbebb3d41a73bf5464a2dd6c8f0f6dd8d2473d2   280035:
 6a60f360bf8f337c319713bd0d2d8f74b27230ac   280031:
 132d02318536d8c60d5bfe8ff072718e263b77a2 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/hid/usbhid/usbkbd.c   | 17 +----------------
 trunk/drivers/hid/usbhid/usbmouse.c | 17 +----------------
 3 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/[refs] b/[refs]
index bb13d48909c4..bc999a602a72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08642e7c52cf43616821520828e504bc717e54a6
+refs/heads/master: 42f06a13445bffae96c5e42fdd721ef65fed6abf
diff --git a/trunk/drivers/hid/usbhid/usbkbd.c b/trunk/drivers/hid/usbhid/usbkbd.c
index 065817329f03..bc445d7e3bf5 100644
--- a/trunk/drivers/hid/usbhid/usbkbd.c
+++ b/trunk/drivers/hid/usbhid/usbkbd.c
@@ -354,19 +354,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);
diff --git a/trunk/drivers/hid/usbhid/usbmouse.c b/trunk/drivers/hid/usbhid/usbmouse.c
index 79b2bf81a059..0f6be45d43d5 100644
--- a/trunk/drivers/hid/usbhid/usbmouse.c
+++ b/trunk/drivers/hid/usbhid/usbmouse.c
@@ -241,19 +241,4 @@ static struct usb_driver usb_mouse_driver = {
 	.id_table	= usb_mouse_id_table,
 };
 
-static int __init usb_mouse_init(void)
-{
-	int retval = usb_register(&usb_mouse_driver);
-	if (retval == 0)
-		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-				DRIVER_DESC "\n");
-	return retval;
-}
-
-static void __exit usb_mouse_exit(void)
-{
-	usb_deregister(&usb_mouse_driver);
-}
-
-module_init(usb_mouse_init);
-module_exit(usb_mouse_exit);
+module_usb_driver(usb_mouse_driver);