Commit f0af8fa4 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] reorganize the API core items 



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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ec29a478

drivers/media/Kconfig

+4 −2
Original line number Diff line number Diff line
@@ -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"

drivers/media/v4l2-core/Kconfig

+24 −8
Original line number Diff line number Diff line
@@ -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

drivers/media/video/Kconfig

+0 −17
Original line number Diff line number Diff line
@@ -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