diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2007-05-23 19:41:06 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2007-05-23 19:41:06 -0400 |
| commit | 8c093da2f9ca5301d886dda4ec36726f09d9e23b (patch) | |
| tree | 0514280c5179ccf02ca1322752eee6fdaaaf6772 /linux/drivers/media/video/saa7134/saa7134-input.c | |
| parent | 4a78e983d25641804f5c0c83b6c10e51063b7872 (diff) | |
| download | mediapointer-dvb-s2-8c093da2f9ca5301d886dda4ec36726f09d9e23b.tar.gz mediapointer-dvb-s2-8c093da2f9ca5301d886dda4ec36726f09d9e23b.tar.bz2 | |
Input: drivers/media - switch to using input_dev->dev.parent
From: Dmitry Torokhov <dtor at mail.ru>
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 <dtor at mail.ru>
Acked-by: Thierry Merle <thierry.merle@free.fr>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-input.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-input.c | 4 |
1 files changed, 4 insertions, 0 deletions
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,12 +379,16 @@ 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; saa7134_ir_start(dev, ir); |