diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-13 03:28:43 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-13 03:28:43 -0500 |
| commit | 20aeeb356ba2e8daa99b5942c528ae2b3ea28433 (patch) | |
| tree | d2cebc7039954851998d592123899f5627def7a9 /drivers/i2c/Kconfig | |
| parent | 07a9e2b2fbdda631eeff54e4b8ebcaaea71be538 (diff) | |
| parent | 5b84ba26a9672e615897234fa5efd3eea2d6b295 (diff) | |
Merge branch 'topic/workq-update' into topic/asoc
Conflicts:
sound/soc/codecs/wm8350.c
sound/soc/codecs/wm8753.c
sound/soc/sh/fsi.c
sound/soc/soc-core.c
Diffstat (limited to 'drivers/i2c/Kconfig')
| -rw-r--r-- | drivers/i2c/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index b923074b2cb..30f06e956bf 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig | |||
| @@ -75,8 +75,7 @@ config I2C_HELPER_AUTO | |||
| 75 | In doubt, say Y. | 75 | In doubt, say Y. |
| 76 | 76 | ||
| 77 | config I2C_SMBUS | 77 | config I2C_SMBUS |
| 78 | tristate | 78 | tristate "SMBus-specific protocols" if !I2C_HELPER_AUTO |
| 79 | prompt "SMBus-specific protocols" if !I2C_HELPER_AUTO | ||
| 80 | help | 79 | help |
| 81 | Say Y here if you want support for SMBus extensions to the I2C | 80 | Say Y here if you want support for SMBus extensions to the I2C |
| 82 | specification. At the moment, the only supported extension is | 81 | specification. At the moment, the only supported extension is |