diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-09 18:58:31 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-09 18:58:31 +0100 |
commit | 799dd75b1a8380a967c929a4551895788c374b31 (patch) | |
tree | 7132aafc4ade16fda136d63f1be6ea867edde79b /drivers/i2c/busses/Kconfig | |
parent | Merge branch 'for-linus' of git://neil.brown.name/md (diff) | |
parent | i2c: Add an interface to lock/unlock an I2C bus segment (diff) | |
download | linux-799dd75b1a8380a967c929a4551895788c374b31.tar.xz linux-799dd75b1a8380a967c929a4551895788c374b31.zip |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c: Add an interface to lock/unlock an I2C bus segment
i2c-piix4: Modify code name SB900 to Hudson-2
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 737335ff2b21..e8fe7f169e25 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -128,7 +128,7 @@ config I2C_PIIX4 ATI SB600 ATI SB700 ATI SB800 - AMD SB900 + AMD Hudson-2 Serverworks OSB4 Serverworks CSB5 Serverworks CSB6 |