[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, 7 insertions, 7 deletions

diff --git a/drivers/media/firewire/firedtv-dvb.c b/drivers/media/firewire/firedtv-dvb.c
index eb7496eab130..f710e17953e3 100644
--- a/drivers/media/firewire/firedtv-dvb.c
+++ b/drivers/media/firewire/firedtv-dvb.c
@@ -71,11 +71,11 @@ int fdtv_start_feed(struct dvb_demux_feed *dvbdmxfeed)
 
         if (dvbdmxfeed->type == DMX_TYPE_TS) {
                 switch (dvbdmxfeed->pes_type) {
-                case DMX_TS_PES_VIDEO:
-                case DMX_TS_PES_AUDIO:
-                case DMX_TS_PES_TELETEXT:
-                case DMX_TS_PES_PCR:
-                case DMX_TS_PES_OTHER:
+                case DMX_PES_VIDEO:
+                case DMX_PES_AUDIO:
+                case DMX_PES_TELETEXT:
+                case DMX_PES_PCR:
+                case DMX_PES_OTHER:
                         c = alloc_channel(fdtv);
                         break;
                 default:
@@ -132,7 +132,7 @@ int fdtv_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
               (demux->dmx.frontend->source != DMX_MEMORY_FE))) {
 
                 if (dvbdmxfeed->ts_type & TS_DECODER) {
-                        if (dvbdmxfeed->pes_type >= DMX_TS_PES_OTHER ||
+                        if (dvbdmxfeed->pes_type >= DMX_PES_OTHER ||
                             !demux->pesfilter[dvbdmxfeed->pes_type])
                                 return -EINVAL;
 
@@ -141,7 +141,7 @@ int fdtv_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
                 }
 
                 if (!(dvbdmxfeed->ts_type & TS_DECODER &&
-                      dvbdmxfeed->pes_type < DMX_TS_PES_OTHER))
+                      dvbdmxfeed->pes_type < DMX_PES_OTHER))
                         return 0;
         }