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/video/saa7134/saa7134-input.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'linux/drivers/media/video/saa7134/saa7134-input.c') diff --git a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c index c505076ae..2e32a86b4 100644 --- a/linux/drivers/media/video/saa7134/saa7134-input.c +++ b/linux/drivers/media/video/saa7134/saa7134-input.c @@ -379,11 +379,15 @@ int saa7134_input_init1(struct saa7134_dev *dev) input_dev->id.vendor = dev->pci->vendor; input_dev->id.product = dev->pci->device; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) + input_dev->dev.parent = &dev->pci->dev; +#else #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) input_dev->cdev.dev = &dev->pci->dev; #else input_dev->dev = &dev->pci->dev; #endif +#endif #endif dev->remote = ir; -- cgit v1.2.3