The patch number 10897 was added via Mauro Carvalho Chehab <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: Mauro Carvalho Chehab <[email protected]>
Fix Kbuild MEDIA_TUNER_CUSTOMIZE dependencies
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
linux/drivers/media/common/tuners/Kconfig | 20 ++++++++++----------
linux/drivers/media/video/au0828/Kconfig | 6 +++---
linux/drivers/media/video/cx23885/Kconfig | 8 ++++----
linux/drivers/media/video/pvrusb2/Kconfig | 4 ++--
4 files changed, 19 insertions(+), 19 deletions(-)
diff -r 02a2f17d0ef1 -r 126bc9eaef44 linux/drivers/media/common/tuners/Kconfig
--- a/linux/drivers/media/common/tuners/Kconfig Tue Mar 10 00:49:58 2009 -0300
+++ b/linux/drivers/media/common/tuners/Kconfig Tue Mar 10 02:30:23 2009 -0300
@@ -66,14 +66,14 @@ config MEDIA_TUNER_TDA827X
config MEDIA_TUNER_TDA827X
tristate "Philips TDA827X silicon tuner"
depends on VIDEO_MEDIA && I2C
- default m if DVB_FE_CUSTOMISE
+ default m if MEDIA_TUNER_CUSTOMIZE
help
A DVB-T silicon tuner module. Say Y when you want to support this
tuner.
config MEDIA_TUNER_TDA18271
tristate "NXP TDA18271 silicon tuner"
depends on VIDEO_MEDIA && I2C
- default m if DVB_FE_CUSTOMISE
+ default m if MEDIA_TUNER_CUSTOMIZE
help
A silicon tuner module. Say Y when you want to support this tuner.
@@ -110,28 +110,28 @@ config MEDIA_TUNER_MT2060
config MEDIA_TUNER_MT2060
tristate "Microtune MT2060 silicon IF tuner"
depends on VIDEO_MEDIA && I2C
- default m if DVB_FE_CUSTOMISE
+ default m if MEDIA_TUNER_CUSTOMIZE
help
A driver for the silicon IF tuner MT2060 from Microtune.
config MEDIA_TUNER_MT2266
tristate "Microtune MT2266 silicon tuner"
depends on VIDEO_MEDIA && I2C
- default m if DVB_FE_CUSTOMISE
+ default m if MEDIA_TUNER_CUSTOMIZE
help
A driver for the silicon baseband tuner MT2266 from Microtune.
config MEDIA_TUNER_MT2131
tristate "Microtune MT2131 silicon tuner"
depends on VIDEO_MEDIA && I2C
- default m if DVB_FE_CUSTOMISE
+ default m if MEDIA_TUNER_CUSTOMIZE
help
A driver for the silicon baseband tuner MT2131 from Microtune.
config MEDIA_TUNER_QT1010
tristate "Quantek QT1010 silicon tuner"
depends on VIDEO_MEDIA && I2C
- default m if DVB_FE_CUSTOMISE
+ default m if MEDIA_TUNER_CUSTOMIZE
help
A driver for the silicon tuner QT1010 from Quantek.
@@ -145,7 +145,7 @@ config MEDIA_TUNER_XC5000
config MEDIA_TUNER_XC5000
tristate "Xceive XC5000 silicon tuner"
depends on VIDEO_MEDIA && I2C
- default m if DVB_FE_CUSTOMISE
+ default m if MEDIA_TUNER_CUSTOMIZE
help
A driver for the silicon tuner XC5000 from Xceive.
This device is only used inside a SiP called togther with a
@@ -154,21 +154,21 @@ config MEDIA_TUNER_MXL5005S
config MEDIA_TUNER_MXL5005S
tristate "MaxLinear MSL5005S silicon tuner"
depends on VIDEO_MEDIA && I2C
- default m if DVB_FE_CUSTOMISE
+ default m if MEDIA_TUNER_CUSTOMIZE
help
A driver for the silicon tuner MXL5005S from MaxLinear.
config MEDIA_TUNER_MXL5007T
tristate "MaxLinear MxL5007T silicon tuner"
depends on VIDEO_MEDIA && I2C
- default m if DVB_FE_CUSTOMISE
+ default m if MEDIA_TUNER_CUSTOMIZE
help
A driver for the silicon tuner MxL5007T from MaxLinear.
config MEDIA_TUNER_MC44S803
tristate "Freescale MC44S803 Low Power CMOS Broadband tuners"
depends on VIDEO_MEDIA && I2C
- default m if DVB_FE_CUSTOMISE
+ default m if MEDIA_TUNER_CUSTOMIZE
help
Say Y here to support the Freescale MC44S803 based tuners
diff -r 02a2f17d0ef1 -r 126bc9eaef44 linux/drivers/media/video/au0828/Kconfig
--- a/linux/drivers/media/video/au0828/Kconfig Tue Mar 10 00:49:58 2009 -0300
+++ b/linux/drivers/media/video/au0828/Kconfig Tue Mar 10 02:30:23 2009 -0300
@@ -5,9 +5,9 @@ config VIDEO_AU0828
select I2C_ALGOBIT
select VIDEO_TVEEPROM
select DVB_AU8522 if !DVB_FE_CUSTOMISE
- select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE
- select MEDIA_TUNER_MXL5007T if !DVB_FE_CUSTOMISE
- select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMISE
+ select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE
+ select MEDIA_TUNER_MXL5007T if !MEDIA_TUNER_CUSTOMIZE
+ select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMIZE
---help---
This is a video4linux driver for Auvitek's USB device.
diff -r 02a2f17d0ef1 -r 126bc9eaef44 linux/drivers/media/video/cx23885/Kconfig
--- a/linux/drivers/media/video/cx23885/Kconfig Tue Mar 10 00:49:58 2009 -0300
+++ b/linux/drivers/media/video/cx23885/Kconfig Tue Mar 10 02:30:23 2009 -0300
@@ -20,10 +20,10 @@ config VIDEO_CX23885
select DVB_STV6110 if !DVB_FE_CUSTOMISE
select DVB_STV0900 if !DVB_FE_CUSTOMISE
select MEDIA_TUNER_MT2131 if !MEDIA_TUNER_CUSTOMIZE
- select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMISE
- select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMISE
- select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMISE
- select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE
+ select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE
+ select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE
+ select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMIZE
+ select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE
---help---
This is a video4linux driver for Conexant 23885 based
TV cards.
diff -r 02a2f17d0ef1 -r 126bc9eaef44 linux/drivers/media/video/pvrusb2/Kconfig
--- a/linux/drivers/media/video/pvrusb2/Kconfig Tue Mar 10 00:49:58 2009 -0300
+++ b/linux/drivers/media/video/pvrusb2/Kconfig Tue Mar 10 02:30:23 2009 -0300
@@ -41,9 +41,9 @@ config VIDEO_PVRUSB2_DVB
select DVB_S5H1409 if !DVB_FE_CUSTOMISE
select DVB_S5H1411 if !DVB_FE_CUSTOMISE
select DVB_TDA10048 if !DVB_FE_CUSTOMISE
- select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMISE
+ select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMIZE
select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
- select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMISE
+ select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE
---help---
This option enables a DVB interface for the pvrusb2 driver.
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/126bc9eaef4484f3681a7f7966493945b0d95314
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
