diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 17:11:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 17:11:56 -0500 |
| commit | 5443040754207f9777f71c892c66e45ba56b0fc1 (patch) | |
| tree | b85a0272b5d5cc8c90d49d9e4856b3d694071d96 /Documentation | |
| parent | 3ea6b3d0e6d0ffd91c0f8cadeb69b7133c038b32 (diff) | |
| parent | 54067ee20645a4ee12a9546aeb3b048b4c44cf60 (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-core: i2c bus should support PM entries in struct dev_pm_ops
i2c: Get rid of I2C_CLIENT_MODULE_PARM
i2c: Drop I2C_CLIENT_INSMOD_2 to 8
i2c: Drop I2C_CLIENT_INSMOD_1
i2c: Get rid of struct i2c_client_address_data
i2c: Drop the kind parameter from detect callbacks
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/i2c/writing-clients | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/i2c/writing-clients b/Documentation/i2c/writing-clients index 7860aafb483d..0a74603eb671 100644 --- a/Documentation/i2c/writing-clients +++ b/Documentation/i2c/writing-clients | |||
| @@ -44,7 +44,7 @@ static struct i2c_driver foo_driver = { | |||
| 44 | /* if device autodetection is needed: */ | 44 | /* if device autodetection is needed: */ |
| 45 | .class = I2C_CLASS_SOMETHING, | 45 | .class = I2C_CLASS_SOMETHING, |
| 46 | .detect = foo_detect, | 46 | .detect = foo_detect, |
| 47 | .address_data = &addr_data, | 47 | .address_list = normal_i2c, |
| 48 | 48 | ||
| 49 | .shutdown = foo_shutdown, /* optional */ | 49 | .shutdown = foo_shutdown, /* optional */ |
| 50 | .suspend = foo_suspend, /* optional */ | 50 | .suspend = foo_suspend, /* optional */ |