diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-15 01:41:26 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-15 01:41:26 -0200 |
commit | d008178a2a79c10f6a8968c40c2dd5452df61664 (patch) | |
tree | a9d56e0470ab0fd340bffcd8d2947b1433d686b5 /linux/drivers/media/video/saa7134 | |
parent | 771b1cc58b98391259bcdb5e4c3d62eb7d4a43d6 (diff) | |
parent | 062e08faa070bd215d73d3162c0e05582d4747da (diff) | |
download | mediapointer-dvb-s2-d008178a2a79c10f6a8968c40c2dd5452df61664.tar.gz mediapointer-dvb-s2-d008178a2a79c10f6a8968c40c2dd5452df61664.tar.bz2 |
merge: http://linuxtv.org/hg/~pinchartl/uvcvideo/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
-rw-r--r-- | linux/drivers/media/video/saa7134/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/Kconfig b/linux/drivers/media/video/saa7134/Kconfig index fc2164e28..7021bbf58 100644 --- a/linux/drivers/media/video/saa7134/Kconfig +++ b/linux/drivers/media/video/saa7134/Kconfig @@ -34,9 +34,9 @@ config VIDEO_SAA7134_DVB select DVB_NXT200X if !DVB_FE_CUSTOMISE select DVB_TDA10086 if !DVB_FE_CUSTOMISE select DVB_TDA826X if !DVB_FE_CUSTOMISE + select MEDIA_TUNER_TDA827X if !DVB_FE_CUSTOMISE select DVB_ISL6421 if !DVB_FE_CUSTOMISE - select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMIZE - select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE + select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE ---help--- This adds support for DVB cards based on the Philips saa7134 chip. |