media: Kconfig: move DVB-specific options to dvb-core/Kconfig

In order to cleanup the main media Kconfig, move the DVB-core
specific options to dvb-core/Kconfig.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 9cc528e0b1207aaad56c866c2498a761c3768ee5..dda449556f22477ee2e110d6afba300e7d9b7c12 100644 (file)
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -161,31 +161,10 @@ config DVB_CORE
        default y
        select CRC32
 
-config DVB_MMAP
-       bool "Enable DVB memory-mapped API (EXPERIMENTAL)"
-       depends on DVB_CORE
-       depends on VIDEO_V4L2=y || VIDEO_V4L2=DVB_CORE
-       select VIDEOBUF2_VMALLOC
        help
-         This option enables DVB experimental memory-mapped API, which
-         reduces the number of context switches to read DVB buffers, as
-         the buffers can use mmap() syscalls.
 
-         Support for it is experimental. Use with care. If unsure,
-         say N.
 
-config DVB_NET
-       bool "DVB Network Support"
-       default (NET && INET)
-       depends on NET && INET && DVB_CORE
-       help
-         This option enables DVB Network Support which is a part of the DVB
-         standard. It is used, for example, by automatic firmware updates used
-         on Set-Top-Boxes. It can also be used to access the Internet via the
-         DVB card, if the network provider supports it.
 
-         You may want to disable the network support on embedded devices. If
-         unsure say Y.
 
 source "drivers/media/v4l2-core/Kconfig"
 source "drivers/media/mc/Kconfig"

diff --git a/drivers/media/dvb-core/Kconfig b/drivers/media/dvb-core/Kconfig
index 61f9e1ce99cb6196e622afcb1bf070b718f076ae..6ffac618417b7a1e226a0b520513912aa8cb6aef 100644 (file)
--- a/drivers/media/dvb-core/Kconfig
+++ b/drivers/media/dvb-core/Kconfig
@@ -3,6 +3,32 @@
 # DVB device configuration
 #
 
+config DVB_MMAP
+       bool "Enable DVB memory-mapped API (EXPERIMENTAL)"
+       depends on DVB_CORE
+       depends on VIDEO_V4L2=y || VIDEO_V4L2=DVB_CORE
+       select VIDEOBUF2_VMALLOC
+       help
+         This option enables DVB experimental memory-mapped API, which
+         reduces the number of context switches to read DVB buffers, as
+         the buffers can use mmap() syscalls.
+
+         Support for it is experimental. Use with care. If unsure,
+         say N.
+
+config DVB_NET
+       bool "DVB Network Support"
+       default (NET && INET)
+       depends on NET && INET && DVB_CORE
+       help
+         This option enables DVB Network Support which is a part of the DVB
+         standard. It is used, for example, by automatic firmware updates used
+         on Set-Top-Boxes. It can also be used to access the Internet via the
+         DVB card, if the network provider supports it.
+
+         You may want to disable the network support on embedded devices. If
+         unsure say Y.
+
 config DVB_MAX_ADAPTERS
        int "maximum number of DVB/ATSC adapters"
        depends on DVB_CORE