diff options
| author | Johannes Stezenbach <devnull@localhost> | 2004-01-06 12:33:18 +0000 |
|---|---|---|
| committer | Johannes Stezenbach <devnull@localhost> | 2004-01-06 12:33:18 +0000 |
| commit | e0e760e24c39699beabc0c04e1b884413e29ed21 (patch) | |
| tree | a6863dfaaa5a7f6ce7538573d992cb62536f71d3 | |
| parent | 075d0f13c5e9a3ef7a7240273092bc9798fb426d (diff) | |
| download | mediapointer-dvb-s2-e0e760e24c39699beabc0c04e1b884413e29ed21.tar.gz mediapointer-dvb-s2-e0e760e24c39699beabc0c04e1b884413e29ed21.tar.bz2 | |
fix build with 2.6.1-rc1-mm2 (VIDIOC_S_CTRL_OLD / VIDIOC_OVERLAY_OLD)
| -rw-r--r-- | linux/drivers/media/common/saa7146_video.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index e4f83f42e..819019339 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -964,7 +964,10 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int return get_control(fh,arg); } case VIDIOC_S_CTRL: +/* FIXME: remove when videodev2.h update is in kernel */ +#ifdef VIDIOC_S_CTRL_OLD case VIDIOC_S_CTRL_OLD: +#endif { DEB_EE(("VIDIOC_S_CTRL\n")); down(&dev->lock); @@ -1075,7 +1078,10 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int return 0; } case VIDIOC_OVERLAY: +/* FIXME: remove when videodev2.h update is in kernel */ +#ifdef VIDIOC_OVERLAY_OLD case VIDIOC_OVERLAY_OLD: +#endif { int on = *(int *)arg; int err = 0; |