make lowlevel drivers dependent on $CONFIG_DVB_CORE, minor help text changes

4 files changed, 18 insertions, 20 deletions

diff --git a/linux/drivers/media/dvb/Config.help b/linux/drivers/media/dvb/Config.help
index c42ca7b5a..d2699b18f 100644
--- a/linux/drivers/media/dvb/Config.help
+++ b/linux/drivers/media/dvb/Config.help
@@ -1,14 +1,15 @@
 CONFIG_DVB
-  Support Digital Video Broadcasting hardware. User tools are available
-  for example from <http://www.linuxtv.org/>. Please report problems
-  regarding this driver to the LinuxDVB mailing list.
+  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.
 
-  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/>. 
 
-  You might want add the following lines to your /etc/modules.conf or 
-  (if you use debian) create a file called /etc/modutils/dvb containing
-  this:
+  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
@@ -16,7 +17,5 @@ CONFIG_DVB
 			grundig_29504-401 grundig_29504-491 \
 			ves1820
 
-  Debian users have to execute the update-modules script thenafter.
-
   If unsure say N.
 
diff --git a/linux/drivers/media/dvb/av7110/Config.help b/linux/drivers/media/dvb/av7110/Config.help
index f80ed5cd8..db5d87a05 100644
--- a/linux/drivers/media/dvb/av7110/Config.help
+++ b/linux/drivers/media/dvb/av7110/Config.help
@@ -8,16 +8,14 @@ CONFIG_DVB_AV7110
 
   Say Y if you own such a card and want to use it.
 
-  Remember to enable CONFIG_VIDEO_DEV. 
-
 
 CONFIG_DVB_AV7110_OSD
   The AV7110 firmware provides some code to generate an OnScreenDisplay
-  on the video output. This is kind of proprietary and not guaranteed to
+  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
-  it's menus, so say Y if you want to use this software.
+  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
index 0a09f9fcf..95c1dc819 100644
--- a/linux/drivers/media/dvb/av7110/Config.in
+++ b/linux/drivers/media/dvb/av7110/Config.in
@@ -1,5 +1,6 @@
-dep_tristate '  SAA7146 based AV7110 and Nova/budget cards' CONFIG_DVB_AV7110 $CONFIG_VIDEO_DEV
+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/frontends/Config.in b/linux/drivers/media/dvb/frontends/Config.in
index 811708ba7..638a9462c 100644
--- a/linux/drivers/media/dvb/frontends/Config.in
+++ b/linux/drivers/media/dvb/frontends/Config.in
@@ -1,9 +1,9 @@
 
 comment 'Supported Frontend Modules'
 
-dep_tristate '  Alps BSRU6 (QPSK)' CONFIG_DVB_ALPS_BSRU6
-dep_tristate '  Alps BSRV2 (QPSK)' CONFIG_DVB_ALPS_BSRV2
-dep_tristate '  Grundig 29504-491 (QPSK)' CONFIG_DVB_GRUNDIG_29504_491
-dep_tristate '  Grundig 29504-401 (OFDM)' CONFIG_DVB_GRUNDIG_29504_401
-dep_tristate '  Frontends with external VES1820 demodulator (QAM)' CONFIG_DVB_VES1820
+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 '  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