Reorganize the API core changes for them to appear closer to the items that enable them, and not at the drivers part of the menu. Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> --- drivers/media/Kconfig | 6 ++++-- drivers/media/v4l2-core/Kconfig | 32 ++++++++++++++++++++++++-------- drivers/media/video/Kconfig | 17 ----------------- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index c6d8658..c9cdc61 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -113,6 +113,8 @@ config VIDEO_V4L2_SUBDEV_API This API is mostly used by camera interfaces in embedded platforms. +source "drivers/media/v4l2-core/Kconfig" + # # DVB Core # Only enables if one of DTV is selected @@ -138,6 +140,8 @@ config DVB_NET You may want to disable the network support on embedded devices. If unsure say Y. +source "drivers/media/dvb-core/Kconfig" + comment "Media drivers" source "drivers/media/rc/Kconfig" @@ -151,7 +155,6 @@ source "drivers/media/tuners/Kconfig" # Video/Radio/Hybrid adapters # -source "drivers/media/v4l2-core/Kconfig" source "drivers/media/video/Kconfig" source "drivers/media/radio/Kconfig" @@ -160,7 +163,6 @@ source "drivers/media/radio/Kconfig" # DVB adapters # -source "drivers/media/dvb-core/Kconfig" source "drivers/media/pci/Kconfig" source "drivers/media/usb/Kconfig" source "drivers/media/mmc/Kconfig" diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2-core/Kconfig index 6f53337..05e530c 100644 --- a/drivers/media/v4l2-core/Kconfig +++ b/drivers/media/v4l2-core/Kconfig @@ -2,27 +2,44 @@ # Generic video config states # +config VIDEO_ADV_DEBUG + bool "Enable advanced debug functionality on V4L2 drivers" + default n + ---help--- + Say Y here to enable advanced debugging functionality on some + V4L devices. + In doubt, say N. + +config VIDEO_FIXED_MINOR_RANGES + bool "Enable old-style fixed minor ranges on drivers/video devices" + default n + ---help--- + Say Y here to enable the old-style fixed-range minor assignments. + Only useful if you rely on the old behavior and use mknod instead of udev. + + When in doubt, say N. + config VIDEO_V4L2 tristate - depends on VIDEO_DEV && VIDEO_V4L2_COMMON + depends on VIDEO_V4L2_COMMON default y config VIDEOBUF_GEN tristate config VIDEOBUF_DMA_SG + tristate depends on HAS_DMA select VIDEOBUF_GEN - tristate config VIDEOBUF_VMALLOC - select VIDEOBUF_GEN tristate + select VIDEOBUF_GEN config VIDEOBUF_DMA_CONTIG + tristate depends on HAS_DMA select VIDEOBUF_GEN - tristate config VIDEOBUF_DVB tristate @@ -43,18 +60,17 @@ config VIDEOBUF2_MEMOPS tristate config VIDEOBUF2_DMA_CONTIG + tristate select VIDEOBUF2_CORE select VIDEOBUF2_MEMOPS - tristate config VIDEOBUF2_VMALLOC + tristate select VIDEOBUF2_CORE select VIDEOBUF2_MEMOPS - tristate config VIDEOBUF2_DMA_SG + tristate #depends on HAS_DMA select VIDEOBUF2_CORE select VIDEOBUF2_MEMOPS - tristate - diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index f9703a0..a7bd9576c 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -26,23 +26,6 @@ menuconfig VIDEO_CAPTURE_DRIVERS if VIDEO_CAPTURE_DRIVERS && VIDEO_V4L2 -config VIDEO_ADV_DEBUG - bool "Enable advanced debug functionality" - default n - ---help--- - Say Y here to enable advanced debugging functionality on some - V4L devices. - In doubt, say N. - -config VIDEO_FIXED_MINOR_RANGES - bool "Enable old-style fixed minor ranges for video devices" - default n - ---help--- - Say Y here to enable the old-style fixed-range minor assignments. - Only useful if you rely on the old behavior and use mknod instead of udev. - - When in doubt, say N. - config VIDEO_HELPER_CHIPS_AUTO bool "Autoselect pertinent encoders/decoders and other helper chips" default y if !EXPERT -- 1.7.11.2 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
