diff --git a/[refs] b/[refs]
index 07d4643163b1..9ccaf9569055 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26ffb95c0012201c9ea9e8d315af1d499e1e66d3
+refs/heads/master: f896260566b08250cdb12802af1ab418dcc6d720
diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig
index fbb2a490574b..730d816f8724 100644
--- a/trunk/drivers/media/video/Kconfig
+++ b/trunk/drivers/media/video/Kconfig
@@ -316,6 +316,13 @@ config VIDEO_M32R_AR_M64278
 	  Say Y here to use the Renesas M64278E-800 camera module,
 	  which supports VGA(640x480 pixcels) size of images.
 
+#
+# Encoder / Decoder module configuration
+#
+
+menu "Encoders and Decoders"
+	depends on VIDEO_DEV
+
 config VIDEO_MSP3400
 	tristate "Micronas MSP34xx audio decoders"
 	depends on VIDEO_DEV && I2C
@@ -365,6 +372,8 @@ config VIDEO_SAA7127
 	  To compile this driver as a module, choose M here: the
 	  module will be called saa7127
 
+endmenu # encoder / decoder chips
+
 #
 # USB Multimedia device configuration
 #