diff --git a/[refs] b/[refs]
index 570a8d300b6d..56cd0c9e2b62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e273db7a99eabb4b2ba66dbaa90a63894cb2f2e3
+refs/heads/master: ad5125913be0a723a2e17824ec688d4890bf978b
diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig
index 9df669e70fd7..c622a4da5663 100644
--- a/trunk/drivers/media/video/Kconfig
+++ b/trunk/drivers/media/video/Kconfig
@@ -342,16 +342,6 @@ config VIDEO_M32R_AR_M64278
 	  Say Y here to use the Renesas M64278E-800 camera module,
 	  which supports VGA(640x480 pixcels) size of images.
 
-config VIDEO_AUDIO_DECODER
-	tristate "Add support for additional audio chipsets"
-	depends on VIDEO_DEV && I2C && EXPERIMENTAL
-	select VIDEO_MSP3400
-	select VIDEO_CS53L32A
-	select VIDEO_WM8775
-	---help---
-	  Say Y here to compile drivers for WM8775, CS53L32A and
-	  MSP34xx audio decoders.
-
 config VIDEO_MSP3400
 	tristate "Micronas MSP34xx audio decoders"
 	depends on VIDEO_DEV && I2C