Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[~andy/linux] / drivers / video / smscufx.c

diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c
index aaccffac67ab2fa50be66f0938b644864c640000..ccbfef5e828f3d19815dc7f91c27164c737f4250 100644 (file)
--- a/drivers/video/smscufx.c
+++ b/drivers/video/smscufx.c
@@ -130,8 +130,8 @@ static struct usb_device_id id_table[] = {
 MODULE_DEVICE_TABLE(usb, id_table);
 
 /* module options */
-static int console;   /* Optionally allow fbcon to consume first framebuffer */
-static int fb_defio = true;  /* Optionally enable fb_defio mmap support */
+static bool console;   /* Optionally allow fbcon to consume first framebuffer */
+static bool fb_defio = true;  /* Optionally enable fb_defio mmap support */
 
 /* ufx keeps a list of urbs for efficient bulk transfers */
 static void ufx_urb_completion(struct urb *urb);
@@ -1792,24 +1792,7 @@ static struct usb_driver ufx_driver = {
        .id_table = id_table,
 };
 
-static int __init ufx_module_init(void)
-{
-       int res;
-
-       res = usb_register(&ufx_driver);
-       if (res)
-               err("usb_register failed. Error number %d", res);
-
-       return res;
-}
-
-static void __exit ufx_module_exit(void)
-{
-       usb_deregister(&ufx_driver);
-}
-
-module_init(ufx_module_init);
-module_exit(ufx_module_exit);
+module_usb_driver(ufx_driver);
 
 static void ufx_urb_completion(struct urb *urb)
 {