From: Andrew Morton Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/media/video/bt8xx/bttv-input.c | 2 +- drivers/media/video/cx88/cx88-input.c | 2 +- drivers/media/video/usbvideo/konicawc.c | 2 +- drivers/media/video/usbvideo/quickcam_messenger.c | 2 +- drivers/usb/input/wacom.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff -puN drivers/usb/input/wacom.c~gregkh-driver-input-device-even-more-fixes-2 drivers/usb/input/wacom.c --- a/drivers/usb/input/wacom.c~gregkh-driver-input-device-even-more-fixes-2 +++ a/drivers/usb/input/wacom.c @@ -876,7 +876,7 @@ static int wacom_probe(struct usb_interf input_dev->name = wacom->features->name; usb_to_input_id(dev, &input_dev->id); - input_dev->cdev.dev = &intf->dev; + input_dev->d.parent = &intf->dev; input_dev->private = wacom; input_dev->open = wacom_open; input_dev->close = wacom_close; diff -puN drivers/video/matrox/matroxfb_base.c~gregkh-driver-input-device-even-more-fixes-2 drivers/video/matrox/matroxfb_base.c diff -puN drivers/media/video/bt8xx/bttv-input.c~gregkh-driver-input-device-even-more-fixes-2 drivers/media/video/bt8xx/bttv-input.c --- a/drivers/media/video/bt8xx/bttv-input.c~gregkh-driver-input-device-even-more-fixes-2 +++ a/drivers/media/video/bt8xx/bttv-input.c @@ -386,7 +386,7 @@ int bttv_input_init(struct bttv *btv) input_dev->id.vendor = btv->c.pci->vendor; input_dev->id.product = btv->c.pci->device; } - input_dev->cdev.dev = &btv->c.pci->dev; + input_dev->d.parent = &btv->c.pci->dev; btv->remote = ir; if (ir->polling) { diff -puN drivers/media/video/usbvideo/konicawc.c~gregkh-driver-input-device-even-more-fixes-2 drivers/media/video/usbvideo/konicawc.c --- a/drivers/media/video/usbvideo/konicawc.c~gregkh-driver-input-device-even-more-fixes-2 +++ a/drivers/media/video/usbvideo/konicawc.c @@ -235,7 +235,7 @@ static void konicawc_register_input(stru input_dev->name = "Konicawc snapshot button"; input_dev->phys = cam->input_physname; usb_to_input_id(dev, &input_dev->id); - input_dev->cdev.dev = &dev->dev; + input_dev->d.parent = &dev->dev; input_dev->evbit[0] = BIT(EV_KEY); input_dev->keybit[LONG(BTN_0)] = BIT(BTN_0); diff -puN drivers/media/video/usbvideo/quickcam_messenger.c~gregkh-driver-input-device-even-more-fixes-2 drivers/media/video/usbvideo/quickcam_messenger.c --- a/drivers/media/video/usbvideo/quickcam_messenger.c~gregkh-driver-input-device-even-more-fixes-2 +++ a/drivers/media/video/usbvideo/quickcam_messenger.c @@ -99,7 +99,7 @@ static void qcm_register_input(struct qc input_dev->name = "QCM button"; input_dev->phys = cam->input_physname; usb_to_input_id(dev, &input_dev->id); - input_dev->cdev.dev = &dev->dev; + input_dev->d.parent = &dev->dev; input_dev->evbit[0] = BIT(EV_KEY); input_dev->keybit[LONG(BTN_0)] = BIT(BTN_0); diff -puN drivers/media/video/cx88/cx88-input.c~gregkh-driver-input-device-even-more-fixes-2 drivers/media/video/cx88/cx88-input.c --- a/drivers/media/video/cx88/cx88-input.c~gregkh-driver-input-device-even-more-fixes-2 +++ a/drivers/media/video/cx88/cx88-input.c @@ -279,7 +279,7 @@ int cx88_ir_init(struct cx88_core *core, input_dev->id.vendor = pci->vendor; input_dev->id.product = pci->device; } - input_dev->cdev.dev = &pci->dev; + input_dev->d.parent = &pci->dev; /* record handles to ourself */ ir->core = core; core->ir = ir; _