diff options
| author | Michael Hunold <devnull@localhost> | 2004-01-05 18:37:28 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2004-01-05 18:37:28 +0000 |
| commit | 48322faf20f97a8bbb774bd63689228a8ff20c26 (patch) | |
| tree | c5c8b323ece4eebe78f6ad87c00a42a68751da0c | |
| parent | af775cd2887be0c964935d83debb2dd4d9926546 (diff) | |
| download | mediapointer-dvb-s2-48322faf20f97a8bbb774bd63689228a8ff20c26.tar.gz mediapointer-dvb-s2-48322faf20f97a8bbb774bd63689228a8ff20c26.tar.bz2 | |
- fix compiler warning
- fix problems caused by changes in ioctl definitions
| -rw-r--r-- | linux/drivers/media/common/saa7146_video.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_compat.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index 537f771ba..e4f83f42e 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -964,6 +964,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int return get_control(fh,arg); } case VIDIOC_S_CTRL: + case VIDIOC_S_CTRL_OLD: { DEB_EE(("VIDIOC_S_CTRL\n")); down(&dev->lock); @@ -1074,6 +1075,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int return 0; } case VIDIOC_OVERLAY: + case VIDIOC_OVERLAY_OLD: { int on = *(int *)arg; int err = 0; diff --git a/linux/drivers/media/dvb/dvb-core/dvb_compat.h b/linux/drivers/media/dvb/dvb-core/dvb_compat.h index 68458de0e..25fb6187b 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_compat.h +++ b/linux/drivers/media/dvb/dvb-core/dvb_compat.h @@ -10,9 +10,6 @@ #define iminor(xx) minor(xx->i_rdev) -#define irqreturn_t void -#define IRQ_NONE -#define IRQ_HANDLED #define strlcpy strncpy extern devfs_handle_t dvb_devfs_handle; |