[2.6 patch] select for drivers/media

[Adrian Bunk <bunk@fs.tum.de>]

The patch below switches drivers/mtd to use select where appropriate.

Could someone with a knowledge of the code please check the following:

DVB_AV7110 and DVB_BUDGET select VIDEO_SAA7146 (without my patch 
VIDEO_SAA7146 depends on them) although they don't fulfill the 
VIDEO_SAA7146 dependencies VIDEO_DEV && PCI && I2C.

Is the intention to enable VIDEO_SAA7146 only when these options are 
enabled or should DVB_AV7110 and DVB_BUDGET depend on these options?


diffstat output:

 drivers/media/Kconfig           |    8 --------
 drivers/media/common/Kconfig    |    7 ++-----
 drivers/media/dvb/ttpci/Kconfig |    3 +++
 drivers/media/video/Kconfig     |   12 ++++++++++++
 4 files changed, 17 insertions(+), 13 deletions(-)

cu
Adrian

--- linux-2.6.0-test6-full/drivers/media/Kconfig.old	2003-09-28 17:40:12.000000000 +0200
+++ linux-2.6.0-test6-full/drivers/media/Kconfig	2003-09-28 17:49:12.000000000 +0200
@@ -34,20 +34,12 @@
 
 config VIDEO_TUNER
 	tristate
-	default y if VIDEO_BT848=y || VIDEO_SAA7134=y || VIDEO_MXB=y
-	default m if VIDEO_BT848=m || VIDEO_SAA7134=m || VIDEO_MXB=m
-	depends on VIDEO_DEV
 
 config VIDEO_BUF
 	tristate
-	default y if VIDEO_BT848=y || VIDEO_SAA7134=y || VIDEO_SAA7146=y
-	default m if VIDEO_BT848=m || VIDEO_SAA7134=m || VIDEO_SAA7146=m
-	depends on VIDEO_DEV
 
 config VIDEO_BTCX
 	tristate
-	default VIDEO_BT848
-	depends on VIDEO_DEV
 
 endmenu
 
--- linux-2.6.0-test6-full/drivers/media/video/Kconfig.old	2003-09-28 17:41:10.000000000 +0200
+++ linux-2.6.0-test6-full/drivers/media/video/Kconfig	2003-09-28 17:45:19.000000000 +0200
@@ -10,6 +10,10 @@
 config VIDEO_BT848
 	tristate "BT848 Video For Linux"
 	depends on VIDEO_DEV && PCI && I2C_ALGOBIT && SOUND
+	select VIDEO_TUNER
+	select VIDEO_BUF
+	select VIDEO_BTCX
+	select VIDEO_VIDEOBUF
 	---help---
 	  Support for BT848 based frame grabber/overlay boards. This includes
 	  the Miro, Hauppauge and STB boards. Please read the material in
@@ -219,6 +223,9 @@
 config VIDEO_SAA7134
 	tristate "Philips SAA7134 support"
 	depends on VIDEO_DEV && PCI && I2C
+	select VIDEO_TUNER
+	select VIDEO_BUF
+	select VIDEO_VIDEOBUF
 	---help---
 	  This is a video4linux driver for Philips SAA7130/7134 based
 	  TV cards.
@@ -229,6 +236,8 @@
 config VIDEO_MXB
 	tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
 	depends on VIDEO_DEV && PCI && I2C
+	select VIDEO_TUNER
+	select VIDEO_SAA7146
 	---help---
 	  This is a video4linux driver for the 'Multimedia eXtension Board'
 	  TV card by Siemens-Nixdorf.
@@ -239,6 +248,7 @@
 config VIDEO_DPC
 	tristate "Philips-Semiconductors 'dpc7146 demonstration board'"
 	depends on VIDEO_DEV && PCI && I2C
+	select VIDEO_SAA7146
 	---help---
 	  This is a video4linux driver for the 'dpc7146 demonstration
 	  board' by Philips-Semiconductors. It's the reference design
@@ -252,6 +262,7 @@
 config VIDEO_HEXIUM_ORION
 	tristate "Hexium HV-PCI6 and Orion frame grabber"
 	depends on VIDEO_DEV && PCI && I2C
+	select VIDEO_SAA7146
 	---help---
 	  This is a video4linux driver for the Hexium HV-PCI6 and
 	  Orion frame grabber cards by Hexium.
@@ -262,6 +273,7 @@
 config VIDEO_HEXIUM_GEMINI
 	tristate "Hexium Gemini frame grabber"
 	depends on VIDEO_DEV && PCI && I2C
+	select VIDEO_SAA7146
 	---help---
 	  This is a video4linux driver for the Hexium Gemini frame
 	  grabber card by Hexium. Please note that the Gemini Dual
--- linux-2.6.0-test6-full/drivers/media/dvb/ttpci/Kconfig.old	2003-09-28 17:46:33.000000000 +0200
+++ linux-2.6.0-test6-full/drivers/media/dvb/ttpci/Kconfig	2003-09-28 17:49:11.000000000 +0200
@@ -1,6 +1,7 @@
 config DVB_AV7110
 	tristate "AV7110 cards"
 	depends on VIDEO_DEV && DVB_CORE
+	select VIDEO_SAA7146
 	help
 	  Support for SAA7146 and AV7110 based DVB cards as produced 
 	  by Fujitsu-Siemens, Technotrend, Hauppauge and others.
@@ -26,6 +27,7 @@
 config DVB_BUDGET
 	tristate "Budget cards"
 	depends on DVB_CORE
+	select VIDEO_SAA7146
 	help
 	  Support for simple SAA7146 based DVB cards
 	  (so called Budget- or Nova-PCI cards) without onboard
--- linux-2.6.0-test6-full/drivers/media/common/Kconfig.old	2003-09-28 17:39:34.000000000 +0200
+++ linux-2.6.0-test6-full/drivers/media/common/Kconfig	2003-09-28 17:55:43.000000000 +0200
@@ -1,11 +1,8 @@
 config VIDEO_SAA7146
         tristate
-        default y if DVB_AV7110=y || DVB_BUDGET=y || DVB_BUDGET_AV=y || VIDEO_MXB=y || VIDEO_DPC=y || VIDEO_HEXIUM_ORION=y || VIDEO_HEXIUM_GEMINI=y
-        default m if DVB_AV7110=m || DVB_BUDGET=m || DVB_BUDGET_AV=m || VIDEO_MXB=m || VIDEO_DPC=m || VIDEO_HEXIUM_ORION=m || VIDEO_HEXIUM_GEMINI=m
         depends on VIDEO_DEV && PCI && I2C
+	select VIDEO_BUF
+	select VIDEO_VIDEOBUF
 
 config VIDEO_VIDEOBUF
         tristate
-        default y if VIDEO_SAA7134=y || VIDEO_BT848=y || VIDEO_SAA7146=y
-        default m if VIDEO_SAA7134=m || VIDEO_BT848=m || VIDEO_SAA7146=m
-        depends on VIDEO_DEV