diff options
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttv-input.c')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-input.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-input.c b/linux/drivers/media/video/bt8xx/bttv-input.c index d25b4c912..fb5df7238 100644 --- a/linux/drivers/media/video/bt8xx/bttv-input.c +++ b/linux/drivers/media/video/bt8xx/bttv-input.c @@ -315,12 +315,16 @@ int bttv_input_init(struct bttv *btv) input_dev->id.vendor = btv->c.pci->vendor; input_dev->id.product = btv->c.pci->device; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) + input_dev->dev.parent = &btv->c.pci->dev; +#else #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) input_dev->cdev.dev = &btv->c.pci->dev; #else input_dev->dev = &btv->c.pci->dev; #endif #endif +#endif btv->remote = ir; bttv_ir_start(btv, ir); |