diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-17 15:53:31 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-17 15:53:31 +0200 |
| commit | 5dd5b667fb09167143e1c49dea40b696f7f3ad52 (patch) | |
| tree | 2b0bc6e4d02bdb78068e4822e06b9413b997bf7a /linux/drivers/media/video | |
| parent | e52d2de8a0a347bfffa821dee2919bcef6ce5b39 (diff) | |
| download | mediapointer-dvb-s2-5dd5b667fb09167143e1c49dea40b696f7f3ad52.tar.gz mediapointer-dvb-s2-5dd5b667fb09167143e1c49dea40b696f7f3ad52.tar.bz2 | |
v4l-dvb: fix compilation issues for kernel 2.6.21
From: Hans Verkuil <hverkuil@xs4all.nl>
- fix unused function warnings in v4l2-i2c-drv.h and v4l2-i2c-drv-legacy.h
- fix ivtvfb.c compile warning that would in fact lead to an oops
- disable DVB_DRX397XD for kernels <= 2.6.21: it needs div64_64
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtvfb.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtvfb.c b/linux/drivers/media/video/ivtv/ivtvfb.c index bdfda48e5..bdedff281 100644 --- a/linux/drivers/media/video/ivtv/ivtvfb.c +++ b/linux/drivers/media/video/ivtv/ivtvfb.c @@ -367,6 +367,7 @@ static int ivtvfb_prep_frame(struct ivtv *itv, int cmd, void __user *source, return ivtvfb_prep_dec_dma_to_device(itv, dest_offset, source, count); } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) static ssize_t ivtvfb_write(struct fb_info *info, const char __user *buf, size_t count, loff_t *ppos) { @@ -448,6 +449,7 @@ static ssize_t ivtvfb_write(struct fb_info *info, const char __user *buf, return (err) ? err : count; } +#endif static int ivtvfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) { @@ -909,7 +911,9 @@ static int ivtvfb_blank(int blank_mode, struct fb_info *info) static struct fb_ops ivtvfb_ops = { .owner = THIS_MODULE, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) .fb_write = ivtvfb_write, +#endif .fb_check_var = ivtvfb_check_var, .fb_set_par = ivtvfb_set_par, .fb_setcolreg = ivtvfb_setcolreg, |