1 files changed, 13 insertions, 6 deletions

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 8567a7a64104..7f5a7cac6dc7 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -134,6 +134,12 @@ config DVB_NET
           You may want to disable the network support on embedded devices. If
           unsure say Y.
 
+# This Kconfig option is used by both PCI and USB drivers
+config TTPCI_EEPROM
+        tristate
+        depends on I2C
+        default n
+
 source "drivers/media/dvb-core/Kconfig"
 
 comment "Media drivers"
@@ -157,17 +163,20 @@ source "drivers/media/firewire/Kconfig"
 # Common driver options
 source "drivers/media/common/Kconfig"
 
+comment "Media ancillary drivers (tuners, sensors, i2c, frontends)"
+
 #
 # Ancillary drivers (tuners, i2c, frontends)
 #
 
 config MEDIA_SUBDRV_AUTOSELECT
-        bool "Autoselect tuners and i2c modules to build"
+        bool "Autoselect ancillary drivers (tuners, sensors, i2c, frontends)"
         depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_CAMERA_SUPPORT
         default y
         help
-          By default, a media driver auto-selects all possible i2c
-          devices that are used by any of the supported devices.
+          By default, a media driver auto-selects all possible ancillary
+          devices such as tuners, sensors, video encoders/decoders and
+          frontends, that are used by any of the supported devices.
 
           This is generally the right thing to do, except when there
           are strict constraints with regards to the kernel size,
@@ -176,12 +185,10 @@ config MEDIA_SUBDRV_AUTOSELECT
           Use this option with care, as deselecting ancillary drivers which
           are, in fact, necessary will result in the lack of the needed
           functionality for your device (it may not tune or may not have
-          the need demodulers).
+          the needed demodulators).
 
           If unsure say Y.
 
-comment "Media ancillary drivers (tuners, sensors, i2c, frontends)"
-
 source "drivers/media/i2c/Kconfig"
 source "drivers/media/tuners/Kconfig"
 source "drivers/media/dvb-frontends/Kconfig"