diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 13:10:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 13:10:25 -0400 |
commit | feeedc6c820e1026453ad865076cee435f24d30a (patch) | |
tree | 3eae5251bef80944048df1915e180394e5b7818c /drivers/i2c/busses/Kconfig | |
parent | a27028349ccbcec9dde9d6dbba9d4017ad9ad5ab (diff) | |
parent | 11f1f2afd6b07729b12aaba479344d7f12d88ff9 (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: Add info->archdata field
i2c: Inform about deprecated chips directory
i2c: Use pci_ioremap_bar()
Schedule removal of the legacy i2c device driver binding model
i2c: Clean up <linux/i2c.h>
i2c: Update and clean up writing-clients document
i2c: Drop 2-byte address block transfer defines
i2c: Delete legacy model documentation
i2c: Constify i2c_get_clientdata's parameter
i2c: Delete outdated client porting guide
i2c: Make clear what the class field of i2c_adapter is good for
i2c-algo-pcf: Fix typo in debugging log message
i2c-algo-pcf: Add adapter hooks around xfer begin and end
i2c-algo-pcf: Pass adapter data into ->waitforpin() method
i2c-i801: Add support for Intel Ibex Peak
Diffstat (limited to 'drivers/i2c/busses/Kconfig')
-rw-r--r-- | drivers/i2c/busses/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index acadbc51fc0f..7f95905bbb9d 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
@@ -97,6 +97,7 @@ config I2C_I801 | |||
97 | ICH9 | 97 | ICH9 |
98 | Tolapai | 98 | Tolapai |
99 | ICH10 | 99 | ICH10 |
100 | PCH | ||
100 | 101 | ||
101 | This driver can also be built as a module. If so, the module | 102 | This driver can also be built as a module. If so, the module |
102 | will be called i2c-i801. | 103 | will be called i2c-i801. |