From: Andrew Morton Update it for input tree changes. Cc: Stefan Lucke Cc: Andrey Panin Cc: Dmitry Torokhov Cc: Vojtech Pavlik Signed-off-by: Andrew Morton --- drivers/input/mouse/touchkit_ps2.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff -puN drivers/input/mouse/touchkit_ps2.c~touchkit-ps-2-touchscreen-driver-fixes drivers/input/mouse/touchkit_ps2.c --- devel/drivers/input/mouse/touchkit_ps2.c~touchkit-ps-2-touchscreen-driver-fixes 2005-10-18 22:10:23.000000000 -0700 +++ devel-akpm/drivers/input/mouse/touchkit_ps2.c 2005-10-18 22:10:23.000000000 -0700 @@ -108,7 +108,7 @@ MODULE_PARM_DESC(mouse, "Report mouse bu static psmouse_ret_t touchkit_ps2_process_byte(struct psmouse *psmouse, struct pt_regs *regs) { unsigned char *packet = psmouse->packet; - struct input_dev *dev = &psmouse->dev; + struct input_dev *dev = psmouse->dev; int x,y; if (psmouse->pktcnt != 5) @@ -167,26 +167,26 @@ int touchkit_ps2_detect(struct psmouse * int touchkit_ps2_init(struct psmouse *psmouse) { - psmouse->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); + psmouse->dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); - set_bit((mouse) ? BTN_MOUSE : BTN_TOUCH,psmouse->dev.keybit); + set_bit((mouse) ? BTN_MOUSE : BTN_TOUCH,psmouse->dev->keybit); if (smartpad) - set_bit(BTN_TOOL_FINGER,psmouse->dev.keybit); + set_bit(BTN_TOOL_FINGER,psmouse->dev->keybit); - psmouse->dev.absbit[0] = BIT(ABS_X) | BIT(ABS_Y); + psmouse->dev->absbit[0] = BIT(ABS_X) | BIT(ABS_Y); /* Used to Scale Compensated Data */ - psmouse->dev.absmin[ABS_X] = TOUCHKIT_MIN_XC; - psmouse->dev.absmax[ABS_X] = TOUCHKIT_MAX_XC; - psmouse->dev.absfuzz[ABS_X] = xfuzz; - psmouse->dev.absflat[ABS_X] = TOUCHKIT_XC_FLAT; - psmouse->dev.absmin[ABS_Y] = TOUCHKIT_MIN_YC; - psmouse->dev.absmax[ABS_Y] = TOUCHKIT_MAX_YC; - psmouse->dev.absfuzz[ABS_Y] = yfuzz; - psmouse->dev.absflat[ABS_Y] = TOUCHKIT_YC_FLAT; + psmouse->dev->absmin[ABS_X] = TOUCHKIT_MIN_XC; + psmouse->dev->absmax[ABS_X] = TOUCHKIT_MAX_XC; + psmouse->dev->absfuzz[ABS_X] = xfuzz; + psmouse->dev->absflat[ABS_X] = TOUCHKIT_XC_FLAT; + psmouse->dev->absmin[ABS_Y] = TOUCHKIT_MIN_YC; + psmouse->dev->absmax[ABS_Y] = TOUCHKIT_MAX_YC; + psmouse->dev->absfuzz[ABS_Y] = yfuzz; + psmouse->dev->absflat[ABS_Y] = TOUCHKIT_YC_FLAT; - input_set_abs_params(&psmouse->dev, ABS_X, 0, 0x07ff, xfuzz, 0); - input_set_abs_params(&psmouse->dev, ABS_Y, 0, 0x07ff, yfuzz, 0); + input_set_abs_params(psmouse->dev, ABS_X, 0, 0x07ff, xfuzz, 0); + input_set_abs_params(psmouse->dev, ABS_Y, 0, 0x07ff, yfuzz, 0); psmouse->protocol_handler = touchkit_ps2_process_byte; psmouse->pktsize = 5; _