vserver 1.9.3

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

diff --git a/drivers/input/joystick/iforce/iforce-serio.c b/drivers/input/joystick/iforce/iforce-serio.c
index 0665b54..9422407 100644 (file)
--- a/drivers/input/joystick/iforce/iforce-serio.c
+++ b/drivers/input/joystick/iforce/iforce-serio.c
@@ -124,7 +124,7 @@ out:
        return IRQ_HANDLED;
 }
 
-static void iforce_serio_connect(struct serio *serio, struct serio_dev *dev)
+static void iforce_serio_connect(struct serio *serio, struct serio_driver *drv)
 {
        struct iforce *iforce;
        if (serio->type != (SERIO_RS232 | SERIO_IFORCE))
@@ -137,7 +137,7 @@ static void iforce_serio_connect(struct serio *serio, struct serio_dev *dev)
        iforce->serio = serio;
        serio->private = iforce;
 
-       if (serio_open(serio, dev)) {
+       if (serio_open(serio, drv)) {
                kfree(iforce);
                return;
        }
@@ -158,9 +158,13 @@ static void iforce_serio_disconnect(struct serio *serio)
        kfree(iforce);
 }
 
-struct serio_dev iforce_serio_dev = {
-       .write_wakeup = iforce_serio_write_wakeup,
-       .interrupt =    iforce_serio_irq,
-       .connect =      iforce_serio_connect,
-       .disconnect =   iforce_serio_disconnect,
+struct serio_driver iforce_serio_drv = {
+       .driver         = {
+               .name   = "iforce",
+       },
+       .description    = "RS232 I-Force joysticks and wheels driver",
+       .write_wakeup   = iforce_serio_write_wakeup,
+       .interrupt      = iforce_serio_irq,
+       .connect        = iforce_serio_connect,
+       .disconnect     = iforce_serio_disconnect,
 };