diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-11 20:09:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-11 20:09:24 -0400 |
commit | 57014123512633ab0c38a4fea4140bf156f6a3a0 (patch) | |
tree | a46e864f9c508d8228e79928519742af6a42b7e4 /include | |
parent | c3921ab71507b108d51a0f1ee960f80cd668a93d (diff) | |
parent | ae429083efe996ca2c569c44fd6fea440676dc33 (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 some more new-style drivers to use module aliasing
i2c: Match dummy devices by type
i2c-sibyte: Mark i2c_sibyte_add_bus() as static
i2c-sibyte: Correct a comment about frequency
i2c: Improve the functionality documentation
i2c: Improve smbus-protocol documentation
i2c-piix4: Blacklist two mainboards
i2c-piix4: Increase the intitial delay for the ServerWorks CSB5
i2c-mpc: Compare to NO_IRQ instead of zero
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/i2c.h | 2 | ||||
-rw-r--r-- | include/media/v4l2-i2c-drv-legacy.h | 2 | ||||
-rw-r--r-- | include/media/v4l2-i2c-drv.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index cb63da5c213..6716ec808c5 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
@@ -262,7 +262,7 @@ i2c_new_probed_device(struct i2c_adapter *adap, | |||
262 | * client handles for the extra addresses. | 262 | * client handles for the extra addresses. |
263 | */ | 263 | */ |
264 | extern struct i2c_client * | 264 | extern struct i2c_client * |
265 | i2c_new_dummy(struct i2c_adapter *adap, u16 address, const char *type); | 265 | i2c_new_dummy(struct i2c_adapter *adap, u16 address); |
266 | 266 | ||
267 | extern void i2c_unregister_device(struct i2c_client *); | 267 | extern void i2c_unregister_device(struct i2c_client *); |
268 | 268 | ||
diff --git a/include/media/v4l2-i2c-drv-legacy.h b/include/media/v4l2-i2c-drv-legacy.h index 347b6f8beb2..878562278b6 100644 --- a/include/media/v4l2-i2c-drv-legacy.h +++ b/include/media/v4l2-i2c-drv-legacy.h | |||
@@ -31,6 +31,7 @@ struct v4l2_i2c_driver_data { | |||
31 | int (*resume)(struct i2c_client *client); | 31 | int (*resume)(struct i2c_client *client); |
32 | int (*legacy_probe)(struct i2c_adapter *adapter); | 32 | int (*legacy_probe)(struct i2c_adapter *adapter); |
33 | int legacy_class; | 33 | int legacy_class; |
34 | const struct i2c_device_id *id_table; | ||
34 | }; | 35 | }; |
35 | 36 | ||
36 | static struct v4l2_i2c_driver_data v4l2_i2c_data; | 37 | static struct v4l2_i2c_driver_data v4l2_i2c_data; |
@@ -124,6 +125,7 @@ static int __init v4l2_i2c_drv_init(void) | |||
124 | v4l2_i2c_driver.command = v4l2_i2c_data.command; | 125 | v4l2_i2c_driver.command = v4l2_i2c_data.command; |
125 | v4l2_i2c_driver.probe = v4l2_i2c_data.probe; | 126 | v4l2_i2c_driver.probe = v4l2_i2c_data.probe; |
126 | v4l2_i2c_driver.remove = v4l2_i2c_data.remove; | 127 | v4l2_i2c_driver.remove = v4l2_i2c_data.remove; |
128 | v4l2_i2c_driver.id_table = v4l2_i2c_data.id_table; | ||
127 | err = i2c_add_driver(&v4l2_i2c_driver); | 129 | err = i2c_add_driver(&v4l2_i2c_driver); |
128 | if (err) | 130 | if (err) |
129 | i2c_del_driver(&v4l2_i2c_driver_legacy); | 131 | i2c_del_driver(&v4l2_i2c_driver_legacy); |
diff --git a/include/media/v4l2-i2c-drv.h b/include/media/v4l2-i2c-drv.h index 7b6f06be795..40ecef29801 100644 --- a/include/media/v4l2-i2c-drv.h +++ b/include/media/v4l2-i2c-drv.h | |||
@@ -36,6 +36,7 @@ struct v4l2_i2c_driver_data { | |||
36 | int (*resume)(struct i2c_client *client); | 36 | int (*resume)(struct i2c_client *client); |
37 | int (*legacy_probe)(struct i2c_adapter *adapter); | 37 | int (*legacy_probe)(struct i2c_adapter *adapter); |
38 | int legacy_class; | 38 | int legacy_class; |
39 | const struct i2c_device_id *id_table; | ||
39 | }; | 40 | }; |
40 | 41 | ||
41 | static struct v4l2_i2c_driver_data v4l2_i2c_data; | 42 | static struct v4l2_i2c_driver_data v4l2_i2c_data; |
@@ -53,6 +54,7 @@ static int __init v4l2_i2c_drv_init(void) | |||
53 | v4l2_i2c_driver.remove = v4l2_i2c_data.remove; | 54 | v4l2_i2c_driver.remove = v4l2_i2c_data.remove; |
54 | v4l2_i2c_driver.suspend = v4l2_i2c_data.suspend; | 55 | v4l2_i2c_driver.suspend = v4l2_i2c_data.suspend; |
55 | v4l2_i2c_driver.resume = v4l2_i2c_data.resume; | 56 | v4l2_i2c_driver.resume = v4l2_i2c_data.resume; |
57 | v4l2_i2c_driver.id_table = v4l2_i2c_data.id_table; | ||
56 | return i2c_add_driver(&v4l2_i2c_driver); | 58 | return i2c_add_driver(&v4l2_i2c_driver); |
57 | } | 59 | } |
58 | 60 | ||