1 files changed, 8 insertions, 10 deletions

diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 11935f66fcd8..434a61b415a3 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -2,9 +2,7 @@
 # I2C subsystem configuration
 #
 
-menu "I2C support"
-
-config I2C
+menuconfig I2C
         tristate "I2C support"
         ---help---
           I2C (pronounce: I-square-C) is a slow serial bus protocol used in
@@ -22,9 +20,14 @@ config I2C
           This I2C support can also be built as a module.  If so, the module
           will be called i2c-core.
 
+if I2C
+
+config I2C_BOARDINFO
+        boolean
+        default y
+
 config I2C_CHARDEV
         tristate "I2C device interface"
-        depends on I2C
         help
           Say Y here to use i2c-* device files, usually found in the /dev
           directory on your system.  They make it possible to have user-space
@@ -40,7 +43,6 @@ source drivers/i2c/chips/Kconfig
 
 config I2C_DEBUG_CORE
         bool "I2C Core debugging messages"
-        depends on I2C
         help
           Say Y here if you want the I2C core to produce a bunch of debug
           messages to the system log.  Select this if you are having a
@@ -48,7 +50,6 @@ config I2C_DEBUG_CORE
 
 config I2C_DEBUG_ALGO
         bool "I2C Algorithm debugging messages"
-        depends on I2C
         help
           Say Y here if you want the I2C algorithm drivers to produce a bunch
           of debug messages to the system log.  Select this if you are having
@@ -57,7 +58,6 @@ config I2C_DEBUG_ALGO
 
 config I2C_DEBUG_BUS
         bool "I2C Bus debugging messages"
-        depends on I2C
         help
           Say Y here if you want the I2C bus drivers to produce a bunch of
           debug messages to the system log.  Select this if you are having
@@ -66,12 +66,10 @@ config I2C_DEBUG_BUS
 
 config I2C_DEBUG_CHIP
         bool "I2C Chip debugging messages"
-        depends on I2C
         help
           Say Y here if you want the I2C chip drivers to produce a bunch of
           debug messages to the system log.  Select this if you are having
           a problem with I2C support and want to see more of what is going
           on.
 
-endmenu
-
+endif # I2C