vserver 1.9.3

[linux-2.6.git] / drivers / input / joystick / iforce / iforce-main.c

diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c
index c53e61a..cf815c7 100644 (file)
--- a/drivers/input/joystick/iforce/iforce-main.c
+++ b/drivers/input/joystick/iforce/iforce-main.c
@@ -166,7 +166,7 @@ static int iforce_upload_effect(struct input_dev *dev, struct ff_effect *effect)
        else {
                /* We want to update an effect */
                if (!CHECK_OWNERSHIP(effect->id, iforce)) return -EACCES;
-               
+
                /* Parameter type cannot be updated */
                if (effect->type != iforce->core_effects[effect->id].effect.type)
                        return -EINVAL;
@@ -273,7 +273,7 @@ static int iforce_flush(struct input_dev *dev, struct file *file)
 
                if (test_bit(FF_CORE_IS_USED, iforce->core_effects[i].flags) &&
                        current->pid == iforce->core_effects[i].owner) {
-                       
+
                        /* Stop effect */
                        input_report_ff(dev, i, 0);
 
@@ -524,7 +524,7 @@ static int __init iforce_init(void)
        usb_register(&iforce_usb_driver);
 #endif
 #ifdef CONFIG_JOYSTICK_IFORCE_232
-       serio_register_device(&iforce_serio_dev);
+       serio_register_driver(&iforce_serio_drv);
 #endif
        return 0;
 }
@@ -535,7 +535,7 @@ static void __exit iforce_exit(void)
        usb_deregister(&iforce_usb_driver);
 #endif
 #ifdef CONFIG_JOYSTICK_IFORCE_232
-       serio_unregister_device(&iforce_serio_dev);
+       serio_unregister_driver(&iforce_serio_drv);
 #endif
 }