Merge git://git.infradead.org/~dedekind/ubi-2.6

[pandora-kernel.git] / drivers / input / touchscreen / gunze.c

diff --git a/drivers/input/touchscreen/gunze.c b/drivers/input/touchscreen/gunze.c
index 9157eb1..a48a158 100644 (file)
--- a/drivers/input/touchscreen/gunze.c
+++ b/drivers/input/touchscreen/gunze.c
@@ -130,15 +130,15 @@ static int gunze_connect(struct serio *serio, struct serio_driver *drv)
        gunze->dev = input_dev;
        snprintf(gunze->phys, sizeof(serio->phys), "%s/input0", serio->phys);
 
-       input_dev->private = gunze;
        input_dev->name = "Gunze AHL-51S TouchScreen";
        input_dev->phys = gunze->phys;
        input_dev->id.bustype = BUS_RS232;
        input_dev->id.vendor = SERIO_GUNZE;
        input_dev->id.product = 0x0051;
        input_dev->id.version = 0x0100;
-       input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-       input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+       input_dev->dev.parent = &serio->dev;
+       input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+       input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
        input_set_abs_params(input_dev, ABS_X, 24, 1000, 0, 0);
        input_set_abs_params(input_dev, ABS_Y, 24, 1000, 0, 0);