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

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

diff --git a/drivers/input/joystick/adi.c b/drivers/input/joystick/adi.c
index e8353526736fbf035d37d6ee92dc76bc6f82efbc..d1ca8a14950f62f914e9d4f9f81ae34a7eabadfe 100644 (file)
--- a/drivers/input/joystick/adi.c
+++ b/drivers/input/joystick/adi.c
@@ -424,14 +424,14 @@ static int adi_init_input(struct adi *adi, struct adi_port *port, int half)
        input_dev->id.vendor = GAMEPORT_ID_VENDOR_LOGITECH;
        input_dev->id.product = adi->id;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &port->gameport->dev;
+       input_dev->dev.parent = &port->gameport->dev;
 
        input_set_drvdata(input_dev, port);
 
        input_dev->open = adi_open;
        input_dev->close = adi_close;
 
-       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 < adi->axes10 + adi->axes8 + (adi->hats + (adi->pad != -1)) * 2; i++)
                set_bit(adi->abs[i], input_dev->absbit);