diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 07:49:39 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 07:49:39 -0500 |
| commit | 220d0b1dbf78c6417a658c96e571415552d3abac (patch) | |
| tree | 70cd3862540c38ea490e7a27c3c7acc35b680234 /drivers/i2c/busses/Kconfig | |
| parent | 474b18ccc264c472abeec50f48469b6477202699 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge branch 'master' into for-2.6.33
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 | |||
| 128 | ATI SB600 | 128 | ATI SB600 |
| 129 | ATI SB700 | 129 | ATI SB700 |
| 130 | ATI SB800 | 130 | ATI SB800 |
| 131 | AMD SB900 | 131 | AMD Hudson-2 |
| 132 | Serverworks OSB4 | 132 | Serverworks OSB4 |
| 133 | Serverworks CSB5 | 133 | Serverworks CSB5 |
| 134 | Serverworks CSB6 | 134 | Serverworks CSB6 |