diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 15:20:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 15:20:02 -0700 |
| commit | 37d8cb5478651b27779b9a80d024c614c452eae3 (patch) | |
| tree | 53fe55f595dea61ba8acd72bd19d2655513b7195 /Documentation | |
| parent | dc522adbee91dd17fa31f8e8cf72673fe0e8370e (diff) | |
| parent | 07da0372dd6ca5517400ce95040861def25930c8 (diff) | |
| download | kernel_samsung_aries-37d8cb5478651b27779b9a80d024c614c452eae3.zip kernel_samsung_aries-37d8cb5478651b27779b9a80d024c614c452eae3.tar.gz kernel_samsung_aries-37d8cb5478651b27779b9a80d024c614c452eae3.tar.bz2 | |
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-parport: Various cleanups
i2c-i801: Don't depend on other kernel driver config options
i2c-i801: Check for vendor Fujitsu before probing for apanel
i2c-i801: Don't probe for slaves on IDF channels
i2c-i801: SMBus patch for Intel Panther Point DeviceIDs
i2c/writing-clients: Fix foo_driver.id_table
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/i2c/busses/i2c-i801 | 1 | ||||
| -rw-r--r-- | Documentation/i2c/writing-clients | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801 index 6df6976..2871fd5 100644 --- a/Documentation/i2c/busses/i2c-i801 +++ b/Documentation/i2c/busses/i2c-i801 @@ -19,6 +19,7 @@ Supported adapters: * Intel 6 Series (PCH) * Intel Patsburg (PCH) * Intel DH89xxCC (PCH) + * Intel Panther Point (PCH) Datasheets: Publicly available at the Intel website On Intel Patsburg and later chipsets, both the normal host SMBus controller diff --git a/Documentation/i2c/writing-clients b/Documentation/i2c/writing-clients index 5ebf5af..5aa5337 100644 --- a/Documentation/i2c/writing-clients +++ b/Documentation/i2c/writing-clients @@ -38,7 +38,7 @@ static struct i2c_driver foo_driver = { .name = "foo", }, - .id_table = foo_ids, + .id_table = foo_idtable, .probe = foo_probe, .remove = foo_remove, /* if device autodetection is needed: */ |