Merge tag 'uas_for_sarah' of git://linutronix.de/users/bigeasy/linux into for-uas...

[linux-2.6-block.git] / drivers / usb / storage / uas.c

diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 036e969009561cbd8c15f55c1e175ad9f16c3925..e0133c9ab0bf1330d3507180c6ba649fb9dcae84 100644 (file)
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -837,18 +837,7 @@ static struct usb_driver uas_driver = {
        .id_table = uas_usb_ids,
 };
 
-static int uas_init(void)
-{
-       return usb_register(&uas_driver);
-}
-
-static void uas_exit(void)
-{
-       usb_deregister(&uas_driver);
-}
-
-module_init(uas_init);
-module_exit(uas_exit);
+module_usb_driver(uas_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Matthew Wilcox and Sarah Sharp");