Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / dvb / dvb-core / dmxdev.c

diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c
index ad1f61d301e1eb9add35fe71930618fba12142b8..e4b5c03ae516a4900c2aef889eeae40677e222e6 100644 (file)
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb/dvb-core/dmxdev.c
@@ -572,13 +572,13 @@ static int dvb_dmxdev_start_feed(struct dmxdev *dmxdev,
        dmx_output_t otype;
        int ret;
        int ts_type;
-       enum dmx_ts_pes ts_pes;
+       dmx_pes_type_t ts_pes;
        struct dmx_ts_feed *tsfeed;
 
        feed->ts = NULL;
        otype = para->output;
 
-       ts_pes = (enum dmx_ts_pes)para->pes_type;
+       ts_pes = para->pes_type;
 
        if (ts_pes < DMX_PES_OTHER)
                ts_type = TS_DECODER;