From 8c093da2f9ca5301d886dda4ec36726f09d9e23b Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Wed, 23 May 2007 19:41:06 -0400 Subject: Input: drivers/media - switch to using input_dev->dev.parent From: Dmitry Torokhov In preparation for struct class_device -> struct device input core conversion switch to using input_dev->dev.parent when specifying device position in sysfs tree. Signed-off-by: Dmitry Torokhov Acked-by: Thierry Merle Signed-off-by: Michael Krufky --- linux/drivers/media/dvb/cinergyT2/cinergyT2.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'linux/drivers/media/dvb/cinergyT2') diff --git a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c index 68796cd8e..30dc9e9db 100644 --- a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c +++ b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c @@ -868,10 +868,14 @@ static int cinergyt2_register_rc(struct cinergyt2 *cinergyt2) input_dev->id.vendor = cinergyt2->udev->descriptor.idVendor; input_dev->id.product = cinergyt2->udev->descriptor.idProduct; input_dev->id.version = 1; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) + input_dev->dev.parent = &cinergyt2->udev->dev; +#else #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) input_dev->cdev.dev = &cinergyt2->udev->dev; #else input_dev->dev = &cinergyt2->udev->dev; +#endif #endif err = input_register_device(input_dev); -- cgit v1.2.3