new 2.5 style KConfig files

12 files changed, 167 insertions, 154 deletions

diff --git a/linux/drivers/media/dvb/Config.help b/linux/drivers/media/dvb/Config.help
deleted file mode 100644
index d2699b18f..000000000
--- a/linux/drivers/media/dvb/Config.help
+++ /dev/null
@@ -1,21 +0,0 @@
-CONFIG_DVB
-  Support Digital Video Broadcasting hardware.  Enable this if you 
-  own a DVB adapter and want to use it or if you compile Linux for 
-  a digital SetTopBox.
-
-  API specs and user tools and are available for example from 
-  <http://www.linuxtv.org/>. 
-
-  Please report problems regarding this driver to the LinuxDVB 
-  mailing list.
-
-  You might want add the following lines to your /etc/modules.conf:
-	
-	alias char-major-250 dvb
-	alias dvb dvb-ttpci
-	below dvb-ttpci alps_bsru6 alps_bsrv2 \
-			grundig_29504-401 grundig_29504-491 \
-			ves1820
-
-  If unsure say N.
-
diff --git a/linux/drivers/media/dvb/Config.in b/linux/drivers/media/dvb/Config.in
deleted file mode 100644
index 40cce4668..000000000
--- a/linux/drivers/media/dvb/Config.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Multimedia device configuration
-#
-mainmenu_option next_comment
-comment 'Digital Video Broadcasting Devices'
-
-bool 'DVB For Linux' CONFIG_DVB
-
-if [ "$CONFIG_DVB" != "n" ]; then
-  source drivers/media/dvb/dvb-core/Config.in
-  source drivers/media/dvb/frontends/Config.in
-
-  comment 'Supported DVB Adapters'
-  source drivers/media/dvb/av7110/Config.in
-fi
-
-endmenu
diff --git a/linux/drivers/media/dvb/Kconfig b/linux/drivers/media/dvb/Kconfig
new file mode 100644
index 000000000..5aba59f9e
--- /dev/null
+++ b/linux/drivers/media/dvb/Kconfig
@@ -0,0 +1,41 @@
+#
+# Multimedia device configuration
+#
+
+menu "Digital Video Broadcasting Devices"
+	depends on VIDEO_DEV!=n
+
+config DVB
+	bool "DVB For Linux"
+	---help---
+	  Support Digital Video Broadcasting hardware.  Enable this if you 
+	  own a DVB adapter and want to use it or if you compile Linux for 
+	  a digital SetTopBox.
+
+	  API specs and user tools and are available for example from 
+	  <http://www.linuxtv.org/>. 
+
+	  Please report problems regarding this driver to the LinuxDVB 
+	  mailing list.
+
+	  You might want add the following lines to your /etc/modules.conf:
+	  	
+	  	alias char-major-250 dvb
+	  	alias dvb dvb-ttpci
+	  	below dvb-ttpci alps_bsru6 alps_bsrv2 \
+	  			grundig_29504-401 grundig_29504-491 \
+	  			ves1820
+
+	  If unsure say N.
+
+source "drivers/media/dvb/dvb-core/Kconfig"
+
+source "drivers/media/dvb/frontends/Kconfig"
+
+comment "Supported DVB Adapters"
+	depends on DVB
+
+source "drivers/media/dvb/av7110/Kconfig"
+
+endmenu
+
diff --git a/linux/drivers/media/dvb/av7110/Config.help b/linux/drivers/media/dvb/av7110/Config.help
deleted file mode 100644
index db5d87a05..000000000
--- a/linux/drivers/media/dvb/av7110/Config.help
+++ /dev/null
@@ -1,21 +0,0 @@
-CONFIG_DVB_AV7110
-  Support for SAA7146 and AV7110 based DVB cards as produced 
-  by Fujitsu-Siemens, Technotrend, Hauppauge and others.
-
-  Simple cards like so called Budget- or Nova-PCI cards are 
-  supported as well as fullfeatured cards with onboard MPEG2 
-  decoder.
-
-  Say Y if you own such a card and want to use it.
-
-
-CONFIG_DVB_AV7110_OSD
-  The AV7110 firmware provides some code to generate an OnScreenDisplay
-  on the video output. This is kind of nonstandard and not guaranteed to
-  be maintained.
-
-  Anyway, some popular DVB software like VDR uses this OSD to render
-  its menus, so say Y if you want to use this software.
-
-  All other people say N.
-
diff --git a/linux/drivers/media/dvb/av7110/Config.in b/linux/drivers/media/dvb/av7110/Config.in
deleted file mode 100644
index 95c1dc819..000000000
--- a/linux/drivers/media/dvb/av7110/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-dep_tristate '  SAA7146 based AV7110 and Nova/budget cards' CONFIG_DVB_AV7110 $CONFIG_VIDEO_DEV $CONFIG_DVB_CORE
-
-if [ "$CONFIG_DVB_AV7110" != "n" ]; then
-  bool     '  AV7110 OSD support' CONFIG_DVB_AV7110_OSD
-fi
-
diff --git a/linux/drivers/media/dvb/av7110/Kconfig b/linux/drivers/media/dvb/av7110/Kconfig
new file mode 100644
index 000000000..6b7e6961d
--- /dev/null
+++ b/linux/drivers/media/dvb/av7110/Kconfig
@@ -0,0 +1,26 @@
+config DVB_AV7110
+	tristate "SAA7146 based AV7110 and Nova/Budget PCI cards"
+	depends on VIDEO_DEV && DVB_CORE
+	help
+	  Support for SAA7146 and AV7110 based DVB cards as produced 
+	  by Fujitsu-Siemens, Technotrend, Hauppauge and others.
+
+	  Simple cards like so called Budget- or Nova-PCI cards are 
+	  supported as well as fullfeatured cards with onboard MPEG2 
+	  decoder.
+
+	  Say Y if you own such a card and want to use it.
+
+config DVB_AV7110_OSD
+	bool "AV7110 OSD support"
+	depends on DVB_AV7110
+	help
+	  The AV7110 firmware provides some code to generate an OnScreenDisplay
+	  on the video output. This is kind of nonstandard and not guaranteed to
+	  be maintained.
+
+	  Anyway, some popular DVB software like VDR uses this OSD to render
+	  its menus, so say Y if you want to use this software.
+
+	  All other people say N.
+
diff --git a/linux/drivers/media/dvb/dvb-core/Config.help b/linux/drivers/media/dvb/dvb-core/Config.help
deleted file mode 100644
index ad3c23d74..000000000
--- a/linux/drivers/media/dvb/dvb-core/Config.help
+++ /dev/null
@@ -1,13 +0,0 @@
-CONFIG_DVB_CORE
-  DVB core utility functions for device handling, software fallbacks etc.
-
-  Say Y when you have a DVB card and want to use it. If unsure say N.
-
-
-CONFIG_DVB_DEVFS_ONLY
-  Drop support for old major/minor device scheme and support only devfs 
-  systems. This saves some code.
-
-  If unsure say N.
-
-
diff --git a/linux/drivers/media/dvb/dvb-core/Config.in b/linux/drivers/media/dvb/dvb-core/Config.in
deleted file mode 100644
index 9c43c6498..000000000
--- a/linux/drivers/media/dvb/dvb-core/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-
-dep_tristate '  DVB Core Support' CONFIG_DVB_CORE $CONFIG_DVB
-
-if [ "$CONFIG_DVB_CORE" != "n" ]; then
-  dep_bool       '  devfs only' CONFIG_DVB_DEVFS_ONLY $CONFIG_DVB_CORE $CONFIG_DEVFS_FS
-fi
-
diff --git a/linux/drivers/media/dvb/dvb-core/Kconfig b/linux/drivers/media/dvb/dvb-core/Kconfig
new file mode 100644
index 000000000..c264b069c
--- /dev/null
+++ b/linux/drivers/media/dvb/dvb-core/Kconfig
@@ -0,0 +1,17 @@
+config DVB_CORE
+	tristate "DVB Core Support"
+	depends on DVB
+	help
+	  DVB core utility functions for device handling, software fallbacks etc.
+
+	  Say Y when you have a DVB card and want to use it. If unsure say N.
+
+config DVB_DEVFS_ONLY
+	bool "devfs only"
+	depends on DVB_CORE=y && DEVFS_FS
+	help
+	  Drop support for old major/minor device scheme and support only devfs 
+	  systems. This saves some code.
+
+	  If unsure say N.
+
diff --git a/linux/drivers/media/dvb/frontends/Config.help b/linux/drivers/media/dvb/frontends/Config.help
deleted file mode 100644
index 57adae862..000000000
--- a/linux/drivers/media/dvb/frontends/Config.help
+++ /dev/null
@@ -1,58 +0,0 @@
-CONFIG_DVB_ALPS_BSRU6
-  A DVB-S tuner module. 
-  
-  Say Y when you want to support this frontend.
-
-  If you don't know what tuner module is soldered on your 
-  DVB adapter simply enable all supported frontends, the 
-  right one will get autodetected.
-
-CONFIG_DVB_ALPS_BSRV2
-  A DVB-S tuner module. Say Y when you want to support this frontend.
-
-  If you don't know what tuner module is soldered on your 
-  DVB adapter simply enable all supported frontends, the 
-  right one will get autodetected.
-
-CONFIG_DVB_ALPS_TDLB7
-  A DVB-T tuner module. Say Y when you want to support this frontend.
-
-  This tuner module needs some microcode located in a file called 
-  "Sc_main.mc" in the windows driver. Please pass the module parameter
-  mcfile="/PATH/FILENAME" when loading alps_tdlb7.o.
-
-  If you don't know what tuner module is soldered on your 
-  DVB adapter simply enable all supported frontends, the 
-  right one will get autodetected.
-
-
-CONFIG_DVB_ALPS_TDMB7
-  A DVB-T tuner module. Say Y when you want to support this frontend.
-
-  If you don't know what tuner module is soldered on your 
-  DVB adapter simply enable all supported frontends, the 
-  right one will get autodetected.
-
-CONFIG_DVB_GRUNDIG_29504_491
-  A DVB-S tuner module. Say Y when you want to support this frontend.
-
-  If you don't know what tuner module is soldered on your 
-  DVB adapter simply enable all supported frontends, the 
-  right one will get autodetected.
-
-CONFIG_DVB_GRUNDIG_29504_401
-  A DVB-T tuner module. Say Y when you want to support this frontend.
-
-  If you don't know what tuner module is soldered on your 
-  DVB adapter simply enable all supported frontends, the 
-  right one will get autodetected.
-
-CONFIG_DVB_VES1820
-  The VES1820 Demodulator is used on many DVB-C PCI cards and in some
-  DVB-C SetTopBoxes. Say Y when you see this demodulator chip near your
-  tuner module.
-
-  If you don't know what tuner module is soldered on your 
-  DVB adapter simply enable all supported frontends, the 
-  right one will get autodetected.
-
diff --git a/linux/drivers/media/dvb/frontends/Config.in b/linux/drivers/media/dvb/frontends/Config.in
deleted file mode 100644
index e397173b4..000000000
--- a/linux/drivers/media/dvb/frontends/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-
-comment 'Supported Frontend Modules'
-
-dep_tristate '  Alps BSRU6 (QPSK)' CONFIG_DVB_ALPS_BSRU6 $CONFIG_DVB_CORE
-dep_tristate '  Alps BSRV2 (QPSK)' CONFIG_DVB_ALPS_BSRV2 $CONFIG_DVB_CORE
-dep_tristate '  Alps TDLB7 (OFDM)' CONFIG_DVB_ALPS_TDLB7 $CONFIG_DVB_CORE
-dep_tristate '  Alps TDMB7 (OFDM)' CONFIG_DVB_ALPS_TDMB7 $CONFIG_DVB_CORE
-dep_tristate '  Grundig 29504-491 (QPSK)' CONFIG_DVB_GRUNDIG_29504_491 $CONFIG_DVB_CORE
-dep_tristate '  Grundig 29504-401 (OFDM)' CONFIG_DVB_GRUNDIG_29504_401 $CONFIG_DVB_CORE
-dep_tristate '  Frontends with external VES1820 demodulator (QAM)' CONFIG_DVB_VES1820 $CONFIG_DVB_CORE
-
diff --git a/linux/drivers/media/dvb/frontends/Kconfig b/linux/drivers/media/dvb/frontends/Kconfig
new file mode 100644
index 000000000..011420893
--- /dev/null
+++ b/linux/drivers/media/dvb/frontends/Kconfig
@@ -0,0 +1,83 @@
+comment "Supported Frontend Modules"
+	depends on DVB
+
+config DVB_ALPS_BSRU6
+	tristate "Alps BSRU6 (QPSK)"
+	depends on DVB_CORE
+	help
+	  A DVB-S tuner module. 
+
+	  Say Y when you want to support this frontend.
+
+	  If you don't know what tuner module is soldered on your 
+	  DVB adapter simply enable all supported frontends, the 
+	  right one will get autodetected.
+
+config DVB_ALPS_BSRV2
+	tristate "Alps BSRV2 (QPSK)"
+	depends on DVB_CORE
+	help
+	  A DVB-S tuner module. Say Y when you want to support this frontend.
+
+	  If you don't know what tuner module is soldered on your 
+	  DVB adapter simply enable all supported frontends, the 
+	  right one will get autodetected.
+
+config DVB_ALPS_TDLB7
+	tristate "Alps TDLB7 (OFDM)"
+	depends on DVB_CORE
+	help
+	  A DVB-T tuner module. Say Y when you want to support this frontend.
+
+	  This tuner module needs some microcode located in a file called
+	  "Sc_main.mc" in the windows driver. Please pass the module parameter
+	  mcfile="/PATH/FILENAME" when loading alps_tdlb7.o.
+
+	  If you don't know what tuner module is soldered on your
+	  DVB adapter simply enable all supported frontends, the
+	  right one will get autodetected.
+
+
+config DVB_ALPS_TDMB7
+	tristate "Alps TDMB7 (OFDM)"
+	depends on DVB_CORE
+	help
+	  A DVB-T tuner module. Say Y when you want to support this frontend.
+
+	  If you don't know what tuner module is soldered on your
+	  DVB adapter simply enable all supported frontends, the
+	  right one will get autodetected.
+
+
+config DVB_GRUNDIG_29504_491
+	tristate "Grundig 29504-491 (QPSK)"
+	depends on DVB_CORE
+	help
+	  A DVB-S tuner module. Say Y when you want to support this frontend.
+
+	  If you don't know what tuner module is soldered on your 
+	  DVB adapter simply enable all supported frontends, the 
+	  right one will get autodetected.
+
+config DVB_GRUNDIG_29504_401
+	tristate "Grundig 29504-401 (OFDM)"
+	depends on DVB_CORE
+	help
+	  A DVB-T tuner module. Say Y when you want to support this frontend.
+
+	  If you don't know what tuner module is soldered on your 
+	  DVB adapter simply enable all supported frontends, the 
+	  right one will get autodetected.
+
+config DVB_VES1820
+	tristate "Frontends with external VES1820 demodulator (QAM)"
+	depends on DVB_CORE
+	help
+	  The VES1820 Demodulator is used on many DVB-C PCI cards and in some
+	  DVB-C SetTopBoxes. Say Y when you see this demodulator chip near your
+	  tuner module.
+
+	  If you don't know what tuner module is soldered on your 
+	  DVB adapter simply enable all supported frontends, the 
+	  right one will get autodetected.
+