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 /include/media/v4l2-i2c-drv.h | |
| 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 'include/media/v4l2-i2c-drv.h')
| -rw-r--r-- | include/media/v4l2-i2c-drv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/v4l2-i2c-drv.h b/include/media/v4l2-i2c-drv.h index 9e4bab276915..7b6f06be7950 100644 --- a/include/media/v4l2-i2c-drv.h +++ b/include/media/v4l2-i2c-drv.h | |||
| @@ -30,7 +30,7 @@ struct v4l2_i2c_driver_data { | |||
| 30 | const char * const name; | 30 | const char * const name; |
| 31 | int driverid; | 31 | int driverid; |
| 32 | int (*command)(struct i2c_client *client, unsigned int cmd, void *arg); | 32 | int (*command)(struct i2c_client *client, unsigned int cmd, void *arg); |
| 33 | int (*probe)(struct i2c_client *client); | 33 | int (*probe)(struct i2c_client *client, const struct i2c_device_id *id); |
| 34 | int (*remove)(struct i2c_client *client); | 34 | int (*remove)(struct i2c_client *client); |
| 35 | int (*suspend)(struct i2c_client *client, pm_message_t state); | 35 | int (*suspend)(struct i2c_client *client, pm_message_t state); |
| 36 | int (*resume)(struct i2c_client *client); | 36 | int (*resume)(struct i2c_client *client); |