diff --git a/[refs] b/[refs]
index 269bc188cf07..570a8d300b6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5c08a2ee906381d85a6f0a3ca309fd56cf3b90f
+refs/heads/master: e273db7a99eabb4b2ba66dbaa90a63894cb2f2e3
diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig
index 2ae2c52718a7..9df669e70fd7 100644
--- a/trunk/drivers/media/video/Kconfig
+++ b/trunk/drivers/media/video/Kconfig
@@ -346,6 +346,8 @@ 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.
@@ -359,6 +361,26 @@ config VIDEO_MSP3400
 	  To compile this driver as a module, choose M here: the
 	  module will be called msp3400
 
+config VIDEO_CS53L32A
+	tristate "Cirrus Logic CS53L32A audio ADC"
+	depends on VIDEO_DEV && I2C && EXPERIMENTAL
+	---help---
+	  Support for the Cirrus Logic CS53L32A low voltage
+	  stereo A/D converter.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called cs53l32a
+
+config VIDEO_WM8775
+	tristate "Wolfson Microelectronics WM8775 audio ADC"
+	depends on VIDEO_DEV && I2C && EXPERIMENTAL
+	---help---
+	  Support for the Wolfson Microelectronics WM8775
+	  high performance stereo A/D Converter.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called wm8775
+
 source "drivers/media/video/cx25840/Kconfig"
 
 config VIDEO_SAA711X
diff --git a/trunk/drivers/media/video/Makefile b/trunk/drivers/media/video/Makefile
index 67fc6d6bd81b..f2bd4c0c4f10 100644
--- a/trunk/drivers/media/video/Makefile
+++ b/trunk/drivers/media/video/Makefile
@@ -46,7 +46,8 @@ obj-$(CONFIG_VIDEO_CX88) += cx88/
 obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
 obj-$(CONFIG_VIDEO_EM28XX) += tvp5150.o
 obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o
-obj-$(CONFIG_VIDEO_AUDIO_DECODER) += wm8775.o cs53l32a.o
+obj-$(CONFIG_VIDEO_CS53L32A) += cs53l32a.o
+obj-$(CONFIG_VIDEO_WM8775) += wm8775.o
 obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/
 obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
 obj-$(CONFIG_VIDEO_MXB) += saa7111.o tda9840.o tea6415c.o tea6420.o mxb.o