To: linus, akpm Cc: parisc, lkml Subject: [PATCH] HIL: input_dev.dev was removed Update the HIL keyboard and mouse drivers after removal of input_dev.dev in 2.6.19-rc1. Signed-Off-By: Geert Uytterhoeven --- keyboard/hil_kbd.c | 2 +- mouse/hil_ptr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- linux-2.6.19-rc1/drivers/input/keyboard/hil_kbd.c 2006-04-27 11:22:16.000000000 +0200 +++ linux-m68k-2.6.19-rc1/drivers/input/keyboard/hil_kbd.c 2006-10-06 21:31:00.000000000 +0200 @@ -328,7 +328,7 @@ static int hil_kbd_connect(struct serio kbd->dev->id.vendor = PCI_VENDOR_ID_HP; kbd->dev->id.product = 0x0001; /* TODO: get from kbd->rsc */ kbd->dev->id.version = 0x0100; /* TODO: get from kbd->rsc */ - kbd->dev->dev = &serio->dev; + kbd->dev->cdev.dev = &serio->dev; for (i = 0; i < 128; i++) { set_bit(hil_kbd_set1[i], kbd->dev->keybit); --- linux-2.6.19-rc1/drivers/input/mouse/hil_ptr.c 2006-04-03 12:39:15.000000000 +0200 +++ linux-m68k-2.6.19-rc1/drivers/input/mouse/hil_ptr.c 2006-10-06 21:35:05.000000000 +0200 @@ -375,7 +375,7 @@ static int hil_ptr_connect(struct serio ptr->dev->id.vendor = PCI_VENDOR_ID_HP; ptr->dev->id.product = 0x0001; /* TODO: get from ptr->rsc */ ptr->dev->id.version = 0x0100; /* TODO: get from ptr->rsc */ - ptr->dev->dev = &serio->dev; + ptr->dev->cdev.dev = &serio->dev; input_register_device(ptr->dev); printk(KERN_INFO "input: %s (%s), ID: %d\n",