Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

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

diff --git a/drivers/input/joystick/guillemot.c b/drivers/input/joystick/guillemot.c
index 3e022dc83941b19872522b3da709e6c29fc00e5f..aa6bfb3fb8cd2b135201e97b7ee7dc99d6263660 100644 (file)
--- a/drivers/input/joystick/guillemot.c
+++ b/drivers/input/joystick/guillemot.c
@@ -231,14 +231,14 @@ static int guillemot_connect(struct gameport *gameport, struct gameport_driver *
        input_dev->id.vendor = GAMEPORT_ID_VENDOR_GUILLEMOT;
        input_dev->id.product = guillemot_type[i].id;
        input_dev->id.version = (int)data[14] << 8 | data[15];
-       input_dev->cdev.dev = &gameport->dev;
+       input_dev->dev.parent = &gameport->dev;
 
        input_set_drvdata(input_dev, guillemot);
 
        input_dev->open = guillemot_open;
        input_dev->close = guillemot_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; (t = guillemot->type->abs[i]) >= 0; i++)
                input_set_abs_params(input_dev, t, 0, 255, 0, 0);