[media] demux.h: Remove duplicated enum

"enum dmx_ts_pes" and "typedef enum dmx_pes_type_t" are just the
same enum declared twice, since Kernel (2.6.12). There's no reason
to duplicate it there, and sparse complains about that:
	drivers/media/dvb-core/dmxdev.c:600:55: warning: mixing different enum types
So, remove the internal define, keeping just the external one.
Internally, use only "enum dmx_ts_pes", as it is too late to drop
dmx_pes_type_t from the userspace API.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/pci/ttpci/av7110.c b/drivers/media/pci/ttpci/av7110.c
index 3dc7aa9b6f40..f38329d29daa 100644
--- a/drivers/media/pci/ttpci/av7110.c
+++ b/drivers/media/pci/ttpci/av7110.c
@@ -990,7 +990,7 @@ static int av7110_start_feed(struct dvb_demux_feed *feed)
 
         if (feed->type == DMX_TYPE_TS) {
                 if ((feed->ts_type & TS_DECODER) &&
-                    (feed->pes_type <= DMX_TS_PES_PCR)) {
+                    (feed->pes_type <= DMX_PES_PCR)) {
                         switch (demux->dmx.frontend->source) {
                         case DMX_MEMORY_FE:
                                 if (feed->ts_type & TS_DECODER)
@@ -1051,14 +1051,14 @@ static int av7110_stop_feed(struct dvb_demux_feed *feed)
 
         if (feed->type == DMX_TYPE_TS) {
                 if (feed->ts_type & TS_DECODER) {
-                        if (feed->pes_type >= DMX_TS_PES_OTHER ||
+                        if (feed->pes_type >= DMX_PES_OTHER ||
                             !demux->pesfilter[feed->pes_type])
                                 return -EINVAL;
                         demux->pids[feed->pes_type] |= 0x8000;
                         demux->pesfilter[feed->pes_type] = NULL;
                 }
                 if (feed->ts_type & TS_DECODER &&
-                    feed->pes_type < DMX_TS_PES_OTHER) {
+                    feed->pes_type < DMX_PES_OTHER) {
                         ret = dvb_feed_stop_pid(feed);
                 } else
                         if ((feed->ts_type & TS_PACKET) &&