diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
| commit | f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b (patch) | |
| tree | c2c130a74be25b0b2dff992e1a195e2728bdaadd /include/linux/i2c/pca953x.h | |
| parent | fd0961ff67727482bb20ca7e8ea97b83e9de2ddb (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'include/linux/i2c/pca953x.h')
| -rw-r--r-- | include/linux/i2c/pca953x.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/i2c/pca953x.h b/include/linux/i2c/pca953x.h index d5c5a60c8a0b..139ba52667c8 100644 --- a/include/linux/i2c/pca953x.h +++ b/include/linux/i2c/pca953x.h | |||
| @@ -24,7 +24,7 @@ struct pca953x_platform_data { | |||
| 24 | int (*teardown)(struct i2c_client *client, | 24 | int (*teardown)(struct i2c_client *client, |
| 25 | unsigned gpio, unsigned ngpio, | 25 | unsigned gpio, unsigned ngpio, |
| 26 | void *context); | 26 | void *context); |
| 27 | char **names; | 27 | const char *const *names; |
| 28 | }; | 28 | }; |
| 29 | 29 | ||
| 30 | #endif /* _LINUX_PCA953X_H */ | 30 | #endif /* _LINUX_PCA953X_H */ |