From 3fcdbe53ee9efa9a5ee39df00fa25ca78790ed36 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 20 Aug 2012 10:02:05 -0300 Subject: [PATCH] --- yaml --- r: 330910 b: refs/heads/master c: 3c8c09b5edcc5b70c4e197b7419d07bf3bc84d89 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/Kconfig | 31 ++++++++++++++----------------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 69eec3990a26..dd0175641c12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b47ff4a3ed42269ab7e9fd67e601b9ee3c76d02e +refs/heads/master: 3c8c09b5edcc5b70c4e197b7419d07bf3bc84d89 diff --git a/trunk/drivers/media/Kconfig b/trunk/drivers/media/Kconfig index dcaaf8ec2837..d5b4e728b4d1 100644 --- a/trunk/drivers/media/Kconfig +++ b/trunk/drivers/media/Kconfig @@ -145,35 +145,32 @@ source "drivers/media/dvb-core/Kconfig" comment "Media drivers" source "drivers/media/rc/Kconfig" -# -# Tuner drivers for DVB and V4L -# - -source "drivers/media/tuners/Kconfig" - -source "drivers/media/i2c/Kconfig" - # # V4L platform/mem2mem drivers # -source "drivers/media/platform/Kconfig" - -source "drivers/media/radio/Kconfig" -source "drivers/media/pci/Kconfig" source "drivers/media/usb/Kconfig" +source "drivers/media/pci/Kconfig" +source "drivers/media/platform/Kconfig" source "drivers/media/mmc/Kconfig" source "drivers/media/parport/Kconfig" +source "drivers/media/radio/Kconfig" comment "Supported FireWire (IEEE 1394) Adapters" depends on DVB_CORE && FIREWIRE source "drivers/media/firewire/Kconfig" -comment "Supported DVB Frontends" - depends on DVB_CORE -source "drivers/media/dvb-frontends/Kconfig" - -# Common drivers +# Common driver options source "drivers/media/common/Kconfig" +# +# Ancillary drivers (tuners, i2c, frontends) +# + +comment "Media ancillary drivers (tuners, sensors, i2c, frontends)" + +source "drivers/media/tuners/Kconfig" +source "drivers/media/i2c/Kconfig" +source "drivers/media/dvb-frontends/Kconfig" + endif # MEDIA_SUPPORT