diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-05 16:39:19 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-05 16:39:19 -0300 |
| commit | 2fec184983c06bf36e79ddae3c2ddf2d8ab61f2d (patch) | |
| tree | 27e7b67f97a0f51925cebe2d8616f8fed4c98983 /linux/drivers/media/dvb | |
| parent | 6d5c9c64cf281711f099edb4b42cae8c9db6b7d9 (diff) | |
| parent | 7c0ef076eb4257ba9803b2312a5e734101900d4b (diff) | |
| download | mediapointer-dvb-s2-2fec184983c06bf36e79ddae3c2ddf2d8ab61f2d.tar.gz mediapointer-dvb-s2-2fec184983c06bf36e79ddae3c2ddf2d8ab61f2d.tar.bz2 | |
merge from adq
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dmxdev.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.c b/linux/drivers/media/dvb/dvb-core/dmxdev.c index 04578df3f..988499dfd 100644 --- a/linux/drivers/media/dvb/dvb-core/dmxdev.c +++ b/linux/drivers/media/dvb/dvb-core/dmxdev.c @@ -872,9 +872,6 @@ static int dvb_demux_do_ioctl(struct inode *inode, struct file *file, mutex_unlock(&dmxdevfilter->mutex); break; - case DMX_GET_EVENT: - break; - case DMX_GET_PES_PIDS: if (!dmxdev->demux->get_pes_pids) { ret = -EINVAL; |