[Blackfin] arch: Add proper SW System Reset delay sequence

[linux-2.6] / drivers / input / joystick / magellan.c

diff --git a/drivers/input/joystick/magellan.c b/drivers/input/joystick/magellan.c
index 4112789f11966a2433e4c570da06962915161e1d..54e676948ebb1caa777dee0195f942fb876478e3 100644 (file)
--- a/drivers/input/joystick/magellan.c
+++ b/drivers/input/joystick/magellan.c
@@ -168,10 +168,9 @@ static int magellan_connect(struct serio *serio, struct serio_driver *drv)
        input_dev->id.vendor = SERIO_MAGELLAN;
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &serio->dev;
-       input_dev->private = magellan;
+       input_dev->dev.parent = &serio->dev;
 
-       input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+       input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
 
        for (i = 0; i < 9; i++)
                set_bit(magellan_buttons[i], input_dev->keybit);