2 files changed, 15 insertions, 3 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index ee0eed441a64..1a95a0eca7a9 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -26,6 +26,7 @@ config VIDEO_BT848
         select VIDEO_IR
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
+        select VIDEO_MSP3400
         ---help---
           Support for BT848 based frame grabber/overlay boards. This includes
           the Miro, Hauppauge and STB boards. Please read the material in
@@ -344,9 +345,19 @@ config VIDEO_M32R_AR_M64278
 config VIDEO_AUDIO_DECODER
         tristate "Add support for additional audio chipsets"
         depends on VIDEO_DEV && I2C && EXPERIMENTAL
+        select VIDEO_MSP3400
         ---help---
-          Say Y here to compile drivers for WM8775 and CS53L32A audio
-          decoders.
+          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
+        ---help---
+          Support for the Micronas MSP34xx series of audio decoders.
+
+          To compile this driver as a module, choose M here: the
+          module will be called msp3400
 
 config VIDEO_DECODER
         tristate "Add support for additional video chipsets"
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 00080224f281..e42a25880781 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -15,7 +15,7 @@ msp3400-objs	:=	msp3400-driver.o msp3400-kthreads.o
 
 obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o v4l1-compat.o compat_ioctl32.o
 
-obj-$(CONFIG_VIDEO_BT848) += bttv.o msp3400.o tvaudio.o \
+obj-$(CONFIG_VIDEO_BT848) += bttv.o tvaudio.o \
         tda7432.o tda9875.o ir-kbd-i2c.o
 obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o
 
@@ -45,6 +45,7 @@ obj-$(CONFIG_VIDEO_SAA7134) += ir-kbd-i2c.o saa7134/
 obj-$(CONFIG_VIDEO_CX88) += cx88/
 obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
 obj-$(CONFIG_VIDEO_EM28XX) += saa7115.o tvp5150.o
+obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o
 obj-$(CONFIG_VIDEO_AUDIO_DECODER) += wm8775.o cs53l32a.o
 obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/
 obj-$(CONFIG_VIDEO_CPIA2) += cpia2/