diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 08:32:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 08:32:48 -0700 |
| commit | 8371f87c9994d9942af5984309835aeb948ba579 (patch) | |
| tree | 54c70fc60b97c1ea9bd8409b0ef36f8322bbf60e /drivers/i2c/busses/Kconfig | |
| parent | add some long-missing capabilities to fs_mask (diff) | |
| parent | i2c: Let new-style drivers implement attach_adapter (diff) | |
| download | linux-dev-8371f87c9994d9942af5984309835aeb948ba579.tar.xz linux-dev-8371f87c9994d9942af5984309835aeb948ba579.zip | |
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: Let new-style drivers implement attach_adapter
i2c: Fix sparse warnings for I2C_BOARD_INFO()
i2c-voodoo3: Deprecate in favor of tdfxfb
i2c-algo-pca: Fix use of uninitialized variable in debug message
Diffstat (limited to 'drivers/i2c/busses/Kconfig')
| -rw-r--r-- | drivers/i2c/busses/Kconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 94eae5c3cbc7..a48c8aee0218 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -604,12 +604,14 @@ comment "Graphics adapter I2C/DDC channel drivers" depends on PCI config I2C_VOODOO3 - tristate "Voodoo 3" + tristate "Voodoo 3 (DEPRECATED)" depends on PCI select I2C_ALGOBIT help If you say yes to this option, support will be included for the - Voodoo 3 I2C interface. + Voodoo 3 I2C interface. This driver is deprecated and you should + use the tdfxfb driver instead, which additionally provides + framebuffer support. This driver can also be built as a module. If so, the module will be called i2c-voodoo3. |