From cb151dd8db1c308817748efe46b51da68524304c Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 20 Jun 2013 10:35:53 -0300
Subject: [PATCH] --- yaml --- r: 377299 b: refs/heads/master c:
 bb69ee27b96110c509d5b92c9ee541d81a821706 h: refs/heads/master i:   377297:
 1723d28ee4b8f36d7f24596bb903a4582cc55f5c   377295:
 16abb862bc0261dd9c05202bd41b111cbae214b8 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/media/Kconfig        | 12 +++++++++---
 trunk/drivers/media/tuners/Kconfig | 20 --------------------
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 9f851c7fe4da..d4a8af4da1f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f63adbb4cb9f952a8daee97f89c8811da5fd68a
+refs/heads/master: bb69ee27b96110c509d5b92c9ee541d81a821706
diff --git a/trunk/drivers/media/Kconfig b/trunk/drivers/media/Kconfig
index 7f5a7cac6dc7..8270388e2a0d 100644
--- a/trunk/drivers/media/Kconfig
+++ b/trunk/drivers/media/Kconfig
@@ -136,9 +136,9 @@ config DVB_NET
 
 # This Kconfig option is used by both PCI and USB drivers
 config TTPCI_EEPROM
-        tristate
-        depends on I2C
-        default n
+	tristate
+	depends on I2C
+	default n
 
 source "drivers/media/dvb-core/Kconfig"
 
@@ -189,6 +189,12 @@ config MEDIA_SUBDRV_AUTOSELECT
 
 	  If unsure say Y.
 
+config MEDIA_ATTACH
+	bool
+	depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT
+	depends on MODULES
+	default MODULES
+
 source "drivers/media/i2c/Kconfig"
 source "drivers/media/tuners/Kconfig"
 source "drivers/media/dvb-frontends/Kconfig"
diff --git a/trunk/drivers/media/tuners/Kconfig b/trunk/drivers/media/tuners/Kconfig
index f6768cad001a..15665debc572 100644
--- a/trunk/drivers/media/tuners/Kconfig
+++ b/trunk/drivers/media/tuners/Kconfig
@@ -1,23 +1,3 @@
-config MEDIA_ATTACH
-	bool "Load and attach frontend and tuner driver modules as needed"
-	depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT
-	depends on MODULES
-	default y if !EXPERT
-	help
-	  Remove the static dependency of DVB card drivers on all
-	  frontend modules for all possible card variants. Instead,
-	  allow the card drivers to only load the frontend modules
-	  they require.
-
-	  Also, tuner module will automatically load a tuner driver
-	  when needed, for analog mode.
-
-	  This saves several KBytes of memory.
-
-	  Note: You will need module-init-tools v3.2 or later for this feature.
-
-	  If unsure say Y.
-
 # Analog TV tuners, auto-loaded via tuner.ko
 config MEDIA_TUNER
 	tristate