diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-25 09:06:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-25 09:06:44 -0700 |
| commit | 5004de1809a5ad97a76840da9f62a1111da505e7 (patch) | |
| tree | 8550cd78e5cc0086922cc307c6a173de923ba957 /drivers/i2c/busses/Kconfig | |
| parent | e584152571d1535a3d27138b91e0ece3b713dd6b (diff) | |
| parent | 8c07e46f39d8c613cf2281c7d87908c0105fb0d0 (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:
i2c: Fix docbook problem
ASoC/TLV320AIC3X: Stop I2C driver ID abuse
i2c-omap: Fix unhandled fault
i2c-bfin-twi: Disable BF54x support for now
Diffstat (limited to 'drivers/i2c/busses/Kconfig')
| -rw-r--r-- | drivers/i2c/busses/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 476b0bb72d6..5fa9c3c67e0 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -100,7 +100,7 @@ config I2C_AU1550 config I2C_BLACKFIN_TWI tristate "Blackfin TWI I2C support" - depends on BF534 || BF536 || BF537 || BF54x + depends on BF534 || BF536 || BF537 help This is the TWI I2C device driver for Blackfin 534/536/537/54x. This driver can also be built as a module. If so, the module |