diff --git a/[refs] b/[refs]
index 4ae463dadd6f..79a1fbb3bd15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6abe6bff6fc62832bc8cce3886b9670ba2542601
+refs/heads/master: bbad7dc5488a04fadebd7fa8aa051d81c2ae0080
diff --git a/trunk/drivers/media/dvb/dvb-core/dmxdev.h b/trunk/drivers/media/dvb/dvb-core/dmxdev.h
index 5d4d18a00a68..1b3e49bd9aa2 100644
--- a/trunk/drivers/media/dvb/dvb-core/dmxdev.h
+++ b/trunk/drivers/media/dvb/dvb-core/dmxdev.h
@@ -37,7 +37,7 @@
 #include "dvbdev.h"
 #include "demux.h"
 
-enum dmxdevype {
+enum dmxdev_type {
 	DMXDEV_TYPE_NONE,
 	DMXDEV_TYPE_SEC,
 	DMXDEV_TYPE_PES,
@@ -76,7 +76,7 @@ struct dmxdev_filter {
 		struct dmx_pes_filter_params pes;
 	} params;
 
-	int type;
+	enum dmxdev_type type;
 	enum dmxdev_state state;
 	struct dmxdev *dev;
 	struct dmxdev_buffer buffer;