Merge branches 'release' and 'autoload' into release

[linux-2.6-omap-h63xx.git] / drivers / input / touchscreen / gunze.c

diff --git a/drivers/input/touchscreen/gunze.c b/drivers/input/touchscreen/gunze.c
index 399eb4a834a4cf19306fa19a5db9d4c497f60c36..a48a15868c4ade3b1067a97f955d819df739c831 100644 (file)
--- a/drivers/input/touchscreen/gunze.c
+++ b/drivers/input/touchscreen/gunze.c
@@ -136,8 +136,9 @@ static int gunze_connect(struct serio *serio, struct serio_driver *drv)
        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);