diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 15:44:43 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 15:44:43 -0700 |
commit | ceadda057c000fa82e6bbe508923d8181414dea7 (patch) | |
tree | c57eeb217dba5d74c3e46d483f10714f5ac7c518 /Documentation/i2c/busses/i2c-ali1563 | |
parent | 95619be590638bd48469ac81c0f6236f349f5640 (diff) | |
parent | fbae3fb1546e199ab0cd185348f8124411a1ca9d (diff) |
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: Remove all i2c_set_clientdata(client, NULL) in drivers
i2c/busses: Move two drivers to embedded section
i2c: Rename i2c_check_addr to i2c_check_addr_busy
i2c: Document reserved I2C addresses
i2c: Check for address validity on client registration
i2c: Share the I2C device presence detection code
Documentation/i2c: Checkpatch cleanup
Diffstat (limited to 'Documentation/i2c/busses/i2c-ali1563')
-rw-r--r-- | Documentation/i2c/busses/i2c-ali1563 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/i2c/busses/i2c-ali1563 b/Documentation/i2c/busses/i2c-ali1563 index 99ad4b9bcc3..54691698d2d 100644 --- a/Documentation/i2c/busses/i2c-ali1563 +++ b/Documentation/i2c/busses/i2c-ali1563 @@ -18,7 +18,7 @@ For an overview of these chips see http://www.acerlabs.com The M1563 southbridge is deceptively similar to the M1533, with a few notable exceptions. One of those happens to be the fact they upgraded the i2c core to be SMBus 2.0 compliant, and happens to be almost identical to -the i2c controller found in the Intel 801 south bridges. +the i2c controller found in the Intel 801 south bridges. Features -------- |