diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-11 10:44:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-11 10:44:13 -0700 |
| commit | 29bb1bdb260cd504c6ec0f567cc0cba6a4cf40e7 (patch) | |
| tree | 5091868c0aadabf85773a462ff5bd95cac28c434 /drivers/i2c/algos/Kconfig | |
| parent | 3f1ae223902834d81b54b5d333f9efca07ad656b (diff) | |
| parent | 8ff69eebf5bf8a123a117b78412d5efb85765d8b (diff) | |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
hwmon: (lm75) Drop legacy i2c driver
i2c: correct some size_t printk formats
i2c: Check for address business before creating clients
i2c: Let users select algorithm drivers manually again
i2c: Fix NULL pointer dereference in i2c_new_probed_device
i2c: Fix oops on bus multiplexer driver loading
Diffstat (limited to 'drivers/i2c/algos/Kconfig')
| -rw-r--r-- | drivers/i2c/algos/Kconfig | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/i2c/algos/Kconfig b/drivers/i2c/algos/Kconfig index 7137a17402f..b788579b822 100644 --- a/drivers/i2c/algos/Kconfig +++ b/drivers/i2c/algos/Kconfig @@ -2,15 +2,20 @@ # I2C algorithm drivers configuration # +menu "I2C Algorithms" + depends on !I2C_HELPER_AUTO + config I2C_ALGOBIT - tristate + tristate "I2C bit-banging interfaces" config I2C_ALGOPCF - tristate + tristate "I2C PCF 8584 interfaces" config I2C_ALGOPCA - tristate + tristate "I2C PCA 9564 interfaces" config I2C_ALGO_SGI tristate depends on SGI_IP22 || SGI_IP32 || X86_VISWS + +endmenu |