aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/Makefile2
-rw-r--r--drivers/media/dvb/Kconfig19
-rw-r--r--drivers/media/dvb/dvb-core/Kconfig16
3 files changed, 14 insertions, 23 deletions
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index c578a529e7a8..8fa19939c2b6 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -5,4 +5,4 @@
5obj-y := common/ 5obj-y := common/
6obj-$(CONFIG_VIDEO_DEV) += video/ 6obj-$(CONFIG_VIDEO_DEV) += video/
7obj-$(CONFIG_VIDEO_DEV) += radio/ 7obj-$(CONFIG_VIDEO_DEV) += radio/
8obj-$(CONFIG_DVB) += dvb/ 8obj-$(CONFIG_DVB_CORE) += dvb/
diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index a97c8f5e9a5d..525c5184f9f7 100644
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -2,23 +2,6 @@
2# Multimedia device configuration 2# Multimedia device configuration
3# 3#
4 4
5menu "Digital Video Broadcasting Devices"
6
7config DVB
8 bool "DVB For Linux"
9 depends on NET && INET
10 ---help---
11 Support Digital Video Broadcasting hardware. Enable this if you
12 own a DVB adapter and want to use it or if you compile Linux for
13 a digital SetTopBox.
14
15 API specs and user tools are available from <http://www.linuxtv.org/>.
16
17 Please report problems regarding this driver to the LinuxDVB
18 mailing list.
19
20 If unsure say N.
21
22source "drivers/media/dvb/dvb-core/Kconfig" 5source "drivers/media/dvb/dvb-core/Kconfig"
23 6
24comment "Supported SAA7146 based PCI Adapters" 7comment "Supported SAA7146 based PCI Adapters"
@@ -47,5 +30,3 @@ source "drivers/media/dvb/pluto2/Kconfig"
47comment "Supported DVB Frontends" 30comment "Supported DVB Frontends"
48 depends on DVB_CORE 31 depends on DVB_CORE
49source "drivers/media/dvb/frontends/Kconfig" 32source "drivers/media/dvb/frontends/Kconfig"
50
51endmenu
diff --git a/drivers/media/dvb/dvb-core/Kconfig b/drivers/media/dvb/dvb-core/Kconfig
index 1990eda10c46..93e24fb0e68e 100644
--- a/drivers/media/dvb/dvb-core/Kconfig
+++ b/drivers/media/dvb/dvb-core/Kconfig
@@ -1,12 +1,22 @@
1config DVB_CORE 1menuconfig DVB_CORE
2 tristate "DVB Core Support" 2 tristate "DVB for Linux"
3 depends on DVB 3 depends on NET && INET
4 select CRC32 4 select CRC32
5 help 5 help
6 Support Digital Video Broadcasting hardware. Enable this if you
7 own a DVB adapter and want to use it or if you compile Linux for
8 a digital SetTopBox.
9
6 DVB core utility functions for device handling, software fallbacks etc. 10 DVB core utility functions for device handling, software fallbacks etc.
7 Say Y when you have a DVB card and want to use it. Say Y if your want 11 Say Y when you have a DVB card and want to use it. Say Y if your want
8 to build your drivers outside the kernel, but need the DVB core. All 12 to build your drivers outside the kernel, but need the DVB core. All
9 in-kernel drivers will select this automatically if needed. 13 in-kernel drivers will select this automatically if needed.
14
15 API specs and user tools are available from <http://www.linuxtv.org/>.
16
17 Please report problems regarding this driver to the LinuxDVB
18 mailing list.
19
10 If unsure say N. 20 If unsure say N.
11 21
12config DVB_CORE_ATTACH 22config DVB_CORE_ATTACH