summaryrefslogtreecommitdiff
path: root/drivers/i2c/Kconfig
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-12-22 12:56:10 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-12-22 12:56:10 +0900
commit7ccbefe07ea0a3570e44d1ec13a307552ee4dadd (patch)
treeba0299694a9f3940f289b6a29cadab853906e3d2 /drivers/i2c/Kconfig
parent623eb15647fc35c5a8cd38985d5958240eb072c1 (diff)
parent90a8a73c06cc32b609a880d48449d7083327e11a (diff)
downloadlwn-7ccbefe07ea0a3570e44d1ec13a307552ee4dadd.tar.gz
lwn-7ccbefe07ea0a3570e44d1ec13a307552ee4dadd.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/i2c/Kconfig')
-rw-r--r--drivers/i2c/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index b923074b2cbe..30f06e956bfb 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -75,8 +75,7 @@ config I2C_HELPER_AUTO
In doubt, say Y.
config I2C_SMBUS
- tristate
- prompt "SMBus-specific protocols" if !I2C_HELPER_AUTO
+ tristate "SMBus-specific protocols" if !I2C_HELPER_AUTO
help
Say Y here if you want support for SMBus extensions to the I2C
specification. At the moment, the only supported extension is