diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 02:24:52 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 02:24:52 -0400 |
| commit | d08fe475120e3f17df37656d0644c0f17a797852 (patch) | |
| tree | 64f0324afa9e884d8f0d738930a2495ba411c897 /drivers/media/common/tuners/Kconfig | |
| parent | fb66c5238547495b4a79f590b20400683702448a (diff) | |
| parent | d762f4383100c2a87b1a3f2d678cd3b5425655b4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Diffstat (limited to 'drivers/media/common/tuners/Kconfig')
| -rw-r--r-- | drivers/media/common/tuners/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/common/tuners/Kconfig index 6fc79f15dcbc..22d3ca36370e 100644 --- a/drivers/media/common/tuners/Kconfig +++ b/drivers/media/common/tuners/Kconfig | |||
| @@ -186,4 +186,12 @@ config MEDIA_TUNER_TDA18218 | |||
| 186 | default m if MEDIA_TUNER_CUSTOMISE | 186 | default m if MEDIA_TUNER_CUSTOMISE |
| 187 | help | 187 | help |
| 188 | NXP TDA18218 silicon tuner driver. | 188 | NXP TDA18218 silicon tuner driver. |
| 189 | |||
| 190 | config MEDIA_TUNER_TDA18212 | ||
| 191 | tristate "NXP TDA18212 silicon tuner" | ||
| 192 | depends on VIDEO_MEDIA && I2C | ||
| 193 | default m if MEDIA_TUNER_CUSTOMISE | ||
| 194 | help | ||
| 195 | NXP TDA18212 silicon tuner driver. | ||
| 196 | |||
| 189 | endmenu | 197 | endmenu |