diff options
-rw-r--r-- | drivers/input/mouse/hil_ptr.c | 2 | ||||
-rw-r--r-- | drivers/input/mouse/psmouse-base.c | 2 | ||||
-rw-r--r-- | drivers/input/mouse/sermouse.c | 2 | ||||
-rw-r--r-- | drivers/input/mouse/vsxxxaa.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/mouse/hil_ptr.c b/drivers/input/mouse/hil_ptr.c index 6c67aa48afb8..449bf4dcbbcc 100644 --- a/drivers/input/mouse/hil_ptr.c +++ b/drivers/input/mouse/hil_ptr.c | |||
@@ -378,7 +378,7 @@ static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver) | |||
378 | ptr->dev->id.vendor = PCI_VENDOR_ID_HP; | 378 | ptr->dev->id.vendor = PCI_VENDOR_ID_HP; |
379 | ptr->dev->id.product = 0x0001; /* TODO: get from ptr->rsc */ | 379 | ptr->dev->id.product = 0x0001; /* TODO: get from ptr->rsc */ |
380 | ptr->dev->id.version = 0x0100; /* TODO: get from ptr->rsc */ | 380 | ptr->dev->id.version = 0x0100; /* TODO: get from ptr->rsc */ |
381 | ptr->dev->cdev.dev = &serio->dev; | 381 | ptr->dev->dev.parent = &serio->dev; |
382 | 382 | ||
383 | input_register_device(ptr->dev); | 383 | input_register_device(ptr->dev); |
384 | printk(KERN_INFO "input: %s (%s), ID: %d\n", | 384 | printk(KERN_INFO "input: %s (%s), ID: %d\n", |
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index 544490589113..f15f695777f8 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c | |||
@@ -1083,7 +1083,7 @@ static int psmouse_switch_protocol(struct psmouse *psmouse, const struct psmouse | |||
1083 | { | 1083 | { |
1084 | struct input_dev *input_dev = psmouse->dev; | 1084 | struct input_dev *input_dev = psmouse->dev; |
1085 | 1085 | ||
1086 | input_dev->cdev.dev = &psmouse->ps2dev.serio->dev; | 1086 | input_dev->dev.parent = &psmouse->ps2dev.serio->dev; |
1087 | 1087 | ||
1088 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL); | 1088 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL); |
1089 | input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT); | 1089 | input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT); |
diff --git a/drivers/input/mouse/sermouse.c b/drivers/input/mouse/sermouse.c index 1cb40e724fec..77b8ee2b9651 100644 --- a/drivers/input/mouse/sermouse.c +++ b/drivers/input/mouse/sermouse.c | |||
@@ -266,7 +266,7 @@ static int sermouse_connect(struct serio *serio, struct serio_driver *drv) | |||
266 | input_dev->id.vendor = sermouse->type; | 266 | input_dev->id.vendor = sermouse->type; |
267 | input_dev->id.product = c; | 267 | input_dev->id.product = c; |
268 | input_dev->id.version = 0x0100; | 268 | input_dev->id.version = 0x0100; |
269 | input_dev->cdev.dev = &serio->dev; | 269 | input_dev->dev.parent = &serio->dev; |
270 | 270 | ||
271 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL); | 271 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL); |
272 | input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT); | 272 | input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT); |
diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c index d65e8a934e50..4a321576f345 100644 --- a/drivers/input/mouse/vsxxxaa.c +++ b/drivers/input/mouse/vsxxxaa.c | |||
@@ -508,7 +508,7 @@ vsxxxaa_connect (struct serio *serio, struct serio_driver *drv) | |||
508 | input_dev->name = mouse->name; | 508 | input_dev->name = mouse->name; |
509 | input_dev->phys = mouse->phys; | 509 | input_dev->phys = mouse->phys; |
510 | input_dev->id.bustype = BUS_RS232; | 510 | input_dev->id.bustype = BUS_RS232; |
511 | input_dev->cdev.dev = &serio->dev; | 511 | input_dev->dev.parent = &serio->dev; |
512 | 512 | ||
513 | set_bit (EV_KEY, input_dev->evbit); /* We have buttons */ | 513 | set_bit (EV_KEY, input_dev->evbit); /* We have buttons */ |
514 | set_bit (EV_REL, input_dev->evbit); | 514 | set_bit (EV_REL, input_dev->evbit); |