diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-15 09:39:52 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-15 09:39:52 -0300 |
| commit | 7101d7659d1b2373fc9876158a14302e879207ee (patch) | |
| tree | a8a46adf66d6f93432f2815eefbdd16250b32c76 | |
| parent | 5aeb59ff7a42d77ddf33f7c75676d1087b146164 (diff) | |
| download | mediapointer-dvb-s2-7101d7659d1b2373fc9876158a14302e879207ee.tar.gz mediapointer-dvb-s2-7101d7659d1b2373fc9876158a14302e879207ee.tar.bz2 | |
Previous patch broke compilation for kernels <2.6.18. Fixing.
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-driver.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c index 93d4e1688..0903a3803 100644 --- a/linux/drivers/media/video/bt8xx/bttv-driver.c +++ b/linux/drivers/media/video/bt8xx/bttv-driver.c @@ -3942,7 +3942,9 @@ static void bttv_unregister_video(struct bttv *btv) /* register video4linux devices */ static int __devinit bttv_register_video(struct bttv *btv) { +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17) int ret; +#endif if (no_overlay <= 0) { bttv_video_template.type |= VID_TYPE_OVERLAY; @@ -3958,11 +3960,16 @@ static int __devinit bttv_register_video(struct bttv *btv) goto err; printk(KERN_INFO "bttv%d: registered device video%d\n", btv->c.nr,btv->video_dev->minor & 0x1f); -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17) ret = video_device_create_file(btv->video_dev, &class_device_attr_card); if (ret < 0) printk(KERN_WARNING "bttv: video_device_create_file error: " "%d\n", ret); +#else +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) + + video_device_create_file(btv->video_dev, &class_device_attr_card); +#endif #endif /* vbi */ |