Commit cfdd4ad0 authored by Michael Krufky's avatar Michael Krufky Committed by Linus Torvalds

V4L/DVB (3494): Kconfig: select VIDEO_MSP3400 to build msp3400.ko

The msp3400 driver is currently only being built if
the bttv driver is selected. There are new drivers
that will be needing msp3400, so simply including
msp3400 in the Makefile is no longer appropriate.
This patch creates VIDEO_MSP3400, and alters VIDEO_BT848, VIDEO_PVRUSB2
and VIDEO_AUDIO_DECODER each to select VIDEO_MSP3400.
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 02c17224
...@@ -26,6 +26,7 @@ config VIDEO_BT848 ...@@ -26,6 +26,7 @@ config VIDEO_BT848
select VIDEO_IR select VIDEO_IR
select VIDEO_TUNER select VIDEO_TUNER
select VIDEO_TVEEPROM select VIDEO_TVEEPROM
select VIDEO_MSP3400
---help--- ---help---
Support for BT848 based frame grabber/overlay boards. This includes Support for BT848 based frame grabber/overlay boards. This includes
the Miro, Hauppauge and STB boards. Please read the material in the Miro, Hauppauge and STB boards. Please read the material in
...@@ -344,9 +345,19 @@ config VIDEO_M32R_AR_M64278 ...@@ -344,9 +345,19 @@ config VIDEO_M32R_AR_M64278
config VIDEO_AUDIO_DECODER config VIDEO_AUDIO_DECODER
tristate "Add support for additional audio chipsets" tristate "Add support for additional audio chipsets"
depends on VIDEO_DEV && I2C && EXPERIMENTAL depends on VIDEO_DEV && I2C && EXPERIMENTAL
select VIDEO_MSP3400
---help--- ---help---
Say Y here to compile drivers for WM8775 and CS53L32A audio Say Y here to compile drivers for WM8775, CS53L32A and
decoders. 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 config VIDEO_DECODER
tristate "Add support for additional video chipsets" tristate "Add support for additional video chipsets"
......
...@@ -15,7 +15,7 @@ msp3400-objs := msp3400-driver.o msp3400-kthreads.o ...@@ -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_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 tda7432.o tda9875.o ir-kbd-i2c.o
obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o
...@@ -45,6 +45,7 @@ obj-$(CONFIG_VIDEO_SAA7134) += ir-kbd-i2c.o saa7134/ ...@@ -45,6 +45,7 @@ obj-$(CONFIG_VIDEO_SAA7134) += ir-kbd-i2c.o saa7134/
obj-$(CONFIG_VIDEO_CX88) += cx88/ obj-$(CONFIG_VIDEO_CX88) += cx88/
obj-$(CONFIG_VIDEO_EM28XX) += em28xx/ obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
obj-$(CONFIG_VIDEO_EM28XX) += saa7115.o tvp5150.o 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_AUDIO_DECODER) += wm8775.o cs53l32a.o
obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/ obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/
obj-$(CONFIG_VIDEO_CPIA2) += cpia2/ obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment