diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 17:48:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 17:48:31 -0400 |
| commit | b57ab7632b8fc1eef139bbbb7a89002be61f99e1 (patch) | |
| tree | 19d4eeea0dbf721312c4e33a423ed29ff70aff88 /Documentation | |
| parent | f12c03722045882a50c270f6332cf2c7b16a83d2 (diff) | |
| parent | 3760f736716f74bdc62a4ba5406934338da93eb2 (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: Convert most new-style drivers to use module aliasing
i2c: Add support for device alias names
i2c-amd756-s4882: Fix an error path
i2c: Drop unused RTC driver IDs
i2c/tps65010: Add missing intialization of client data
i2c-sis5595: Minor cleanups in sis5595_access
i2c-piix4: Minor cleanups
i2c: Spelling fix (successful)
i2c-stub: No newline in parameter description
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/i2c/writing-clients | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/i2c/writing-clients b/Documentation/i2c/writing-clients index bfb0a5520817..ee75cbace28d 100644 --- a/Documentation/i2c/writing-clients +++ b/Documentation/i2c/writing-clients | |||
| @@ -164,7 +164,8 @@ I2C device drivers using this binding model work just like any other | |||
| 164 | kind of driver in Linux: they provide a probe() method to bind to | 164 | kind of driver in Linux: they provide a probe() method to bind to |
| 165 | those devices, and a remove() method to unbind. | 165 | those devices, and a remove() method to unbind. |
| 166 | 166 | ||
| 167 | static int foo_probe(struct i2c_client *client); | 167 | static int foo_probe(struct i2c_client *client, |
| 168 | const struct i2c_device_id *id); | ||
| 168 | static int foo_remove(struct i2c_client *client); | 169 | static int foo_remove(struct i2c_client *client); |
| 169 | 170 | ||
| 170 | Remember that the i2c_driver does not create those client handles. The | 171 | Remember that the i2c_driver does not create those client handles. The |