Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

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

diff --git a/drivers/input/joystick/grip.c b/drivers/input/joystick/grip.c
index 41da7f17d6eee316f2a5f35f0d3dd5647e705736..fd3853ab1aad4db5499cea82c62872d720c16edc 100644 (file)
--- a/drivers/input/joystick/grip.c
+++ b/drivers/input/joystick/grip.c
@@ -363,14 +363,14 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv)
                input_dev->id.vendor = GAMEPORT_ID_VENDOR_GRAVIS;
                input_dev->id.product = grip->mode[i];
                input_dev->id.version = 0x0100;
-               input_dev->cdev.dev = &gameport->dev;
+               input_dev->dev.parent = &gameport->dev;
 
                input_set_drvdata(input_dev, grip);
 
                input_dev->open = grip_open;
                input_dev->close = grip_close;
 
-               input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+               input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
 
                for (j = 0; (t = grip_abs[grip->mode[i]][j]) >= 0; j++) {