diff --git a/[refs] b/[refs]
index d798e10e76a9..67c679dcc509 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65c9fd4609ccbabe4aa354eeab7823507424d8b3
+refs/heads/master: 1ed1dd54b0456a880ab4090275a47eb5a7a245d1
diff --git a/trunk/drivers/media/video/em28xx/em28xx.h b/trunk/drivers/media/video/em28xx/em28xx.h
index 5956e9b3062f..d1679a6eb33f 100644
--- a/trunk/drivers/media/video/em28xx/em28xx.h
+++ b/trunk/drivers/media/video/em28xx/em28xx.h
@@ -271,6 +271,7 @@ struct em28xx_input {
 #define INPUT(nr) (&em28xx_boards[dev->model].input[nr])
 
 enum em28xx_decoder {
+	EM28XX_NODECODER,
 	EM28XX_TVP5150,
 	EM28XX_SAA7113,
 	EM28XX_SAA7114