diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-29 19:32:30 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-29 19:32:30 +0200 |
| commit | cc503cb2fceaaa0e85f3fc7df46abbb4c8bfe10c (patch) | |
| tree | 59019fdab8dae4433b4e3af04676ef9550b3193b /linux/drivers/media/video/Kconfig | |
| parent | a7aa675c92fa3d11e83bf8990e98fd06e2c95459 (diff) | |
| parent | 8cb185c4aa68c43b8b1c9c964c7ab785ecfbb928 (diff) | |
| download | mediapointer-dvb-s2-cc503cb2fceaaa0e85f3fc7df46abbb4c8bfe10c.tar.gz mediapointer-dvb-s2-cc503cb2fceaaa0e85f3fc7df46abbb4c8bfe10c.tar.bz2 | |
merge: from master.
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/Kconfig')
| -rw-r--r-- | linux/drivers/media/video/Kconfig | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index 62e71b527..ba64440c2 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -336,15 +336,25 @@ config VIDEO_CS53L32A module will be called cs53l32a config VIDEO_WM8775 - tristate "Wolfson Microelectronics WM8775 audio ADC" + tristate "Wolfson Microelectronics WM8775 audio ADC with input mixer" depends on VIDEO_DEV && I2C && EXPERIMENTAL ---help--- - Support for the Wolfson Microelectronics WM8775 - high performance stereo A/D Converter. + Support for the Wolfson Microelectronics WM8775 high + performance stereo A/D Converter with a 4 channel input mixer. To compile this driver as a module, choose M here: the module will be called wm8775 +config VIDEO_WM8739 + tristate "Wolfson Microelectronics WM8739 stereo audio ADC" + depends on VIDEO_DEV && I2C && EXPERIMENTAL + ---help--- + Support for the Wolfson Microelectronics WM8739 + stereo A/D Converter. + + To compile this driver as a module, choose M here: the + module will be called wm8739 + source "drivers/media/video/cx25840/Kconfig" config VIDEO_SAA711X |