From: Andrew Morton This is getting boring. Cc: Kay Sievers Cc: Dmitry Torokhov Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/input/joystick/adi.c | 2 +- drivers/input/joystick/cobra.c | 2 +- drivers/input/keyboard/lkkbd.c | 2 +- drivers/input/keyboard/newtonkbd.c | 2 +- drivers/input/keyboard/sunkbd.c | 2 +- drivers/input/keyboard/xtkbd.c | 2 +- drivers/input/mouse/sermouse.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff -puN drivers/input/joystick/adi.c~gregkh-driver-input-device-more-fixes drivers/input/joystick/adi.c --- a/drivers/input/joystick/adi.c~gregkh-driver-input-device-more-fixes +++ a/drivers/input/joystick/adi.c @@ -424,7 +424,7 @@ static int adi_init_input(struct adi *ad input_dev->id.vendor = GAMEPORT_ID_VENDOR_LOGITECH; input_dev->id.product = adi->id; input_dev->id.version = 0x0100; - input_dev->cdev.dev = &port->gameport->dev; + input_dev->d.parent = &port->gameport->dev; input_dev->private = port; input_dev->open = adi_open; diff -puN drivers/input/keyboard/lkkbd.c~gregkh-driver-input-device-more-fixes drivers/input/keyboard/lkkbd.c --- a/drivers/input/keyboard/lkkbd.c~gregkh-driver-input-device-more-fixes +++ a/drivers/input/keyboard/lkkbd.c @@ -674,7 +674,7 @@ lkkbd_connect (struct serio *serio, stru input_dev->id.vendor = SERIO_LKKBD; input_dev->id.product = 0; input_dev->id.version = 0x0100; - input_dev->cdev.dev = &serio->dev; + input_dev->d.parent = &serio->dev; input_dev->event = lkkbd_event; input_dev->private = lk; diff -puN drivers/input/keyboard/xtkbd.c~gregkh-driver-input-device-more-fixes drivers/input/keyboard/xtkbd.c --- a/drivers/input/keyboard/xtkbd.c~gregkh-driver-input-device-more-fixes +++ a/drivers/input/keyboard/xtkbd.c @@ -109,7 +109,7 @@ static int xtkbd_connect(struct serio *s input_dev->id.vendor = 0x0001; input_dev->id.product = 0x0001; input_dev->id.version = 0x0100; - input_dev->cdev.dev = &serio->dev; + input_dev->d.parent = &serio->dev; input_dev->private = xtkbd; input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP); diff -puN drivers/input/keyboard/sunkbd.c~gregkh-driver-input-device-more-fixes drivers/input/keyboard/sunkbd.c --- a/drivers/input/keyboard/sunkbd.c~gregkh-driver-input-device-more-fixes +++ a/drivers/input/keyboard/sunkbd.c @@ -272,7 +272,7 @@ static int sunkbd_connect(struct serio * input_dev->id.vendor = SERIO_SUNKBD; input_dev->id.product = sunkbd->type; input_dev->id.version = 0x0100; - input_dev->cdev.dev = &serio->dev; + input_dev->d.parent = &serio->dev; input_dev->private = sunkbd; input_dev->event = sunkbd_event; diff -puN drivers/input/keyboard/newtonkbd.c~gregkh-driver-input-device-more-fixes drivers/input/keyboard/newtonkbd.c --- a/drivers/input/keyboard/newtonkbd.c~gregkh-driver-input-device-more-fixes +++ a/drivers/input/keyboard/newtonkbd.c @@ -105,7 +105,7 @@ static int nkbd_connect(struct serio *se input_dev->id.vendor = SERIO_NEWTON; input_dev->id.product = 0x0001; input_dev->id.version = 0x0100; - input_dev->cdev.dev = &serio->dev; + input_dev->d.parent = &serio->dev; input_dev->private = nkbd; input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP); diff -puN drivers/input/mouse/sermouse.c~gregkh-driver-input-device-more-fixes drivers/input/mouse/sermouse.c --- a/drivers/input/mouse/sermouse.c~gregkh-driver-input-device-more-fixes +++ a/drivers/input/mouse/sermouse.c @@ -262,7 +262,7 @@ static int sermouse_connect(struct serio input_dev->id.vendor = sermouse->type; input_dev->id.product = c; input_dev->id.version = 0x0100; - input_dev->cdev.dev = &serio->dev; + input_dev->d.parent = &serio->dev; input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL); input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT); diff -puN drivers/media/dvb/dvb-usb/dvb-usb-remote.c~gregkh-driver-input-device-more-fixes drivers/media/dvb/dvb-usb/dvb-usb-remote.c diff -puN drivers/input/joystick/cobra.c~gregkh-driver-input-device-more-fixes drivers/input/joystick/cobra.c --- a/drivers/input/joystick/cobra.c~gregkh-driver-input-device-more-fixes +++ a/drivers/input/joystick/cobra.c @@ -211,7 +211,7 @@ static int cobra_connect(struct gameport input_dev->id.vendor = GAMEPORT_ID_VENDOR_CREATIVE; input_dev->id.product = 0x0008; input_dev->id.version = 0x0100; - input_dev->cdev.dev = &gameport->dev; + input_dev->d.parent = &gameport->dev; input_dev->private = cobra; input_dev->open = cobra_open; _