Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

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

diff --git a/drivers/input/touchscreen/touchwin.c b/drivers/input/touchscreen/touchwin.c
index 4dc073dacabbdbb2080d71fe15106422d5557342..ac4bdcf186660a8c040ea5604648a59438061808 100644 (file)
--- a/drivers/input/touchscreen/touchwin.c
+++ b/drivers/input/touchscreen/touchwin.c
@@ -125,13 +125,13 @@ static int tw_connect(struct serio *serio, struct serio_driver *drv)
        tw->dev = input_dev;
        snprintf(tw->phys, sizeof(tw->phys), "%s/input0", serio->phys);
 
-       input_dev->private = tw;
        input_dev->name = "Touchwindow Serial TouchScreen";
        input_dev->phys = tw->phys;
        input_dev->id.bustype = BUS_RS232;
        input_dev->id.vendor = SERIO_TOUCHWIN;
        input_dev->id.product = 0;
        input_dev->id.version = 0x0100;
+       input_dev->dev.parent = &serio->dev;
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
        input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
        input_set_abs_params(tw->dev, ABS_X, TW_MIN_XC, TW_MAX_XC, 0, 0);