diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-07 09:38:48 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-07 09:38:48 -0300 |
| commit | b45e6695b878bc54daf6723c4c8491e6ae23b5a7 (patch) | |
| tree | 265c7cc42f6cb16eedcbfd00fca360771770f5d8 /linux/drivers/media/dvb/dvb-core/dmxdev.c | |
| parent | 76a47ac5aead7ba38156a30c8817303794ede373 (diff) | |
| parent | 2fec184983c06bf36e79ddae3c2ddf2d8ab61f2d (diff) | |
| download | mediapointer-dvb-s2-b45e6695b878bc54daf6723c4c8491e6ae23b5a7.tar.gz mediapointer-dvb-s2-b45e6695b878bc54daf6723c4c8491e6ae23b5a7.tar.bz2 | |
Merge from http://linuxtv.org/hg/~mkrufky/kbuild
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-core/dmxdev.c')
| -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; |