diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-06-08 14:40:08 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-06-08 14:40:08 -0400 |
| commit | 76962be8491b18ae7ff4fd6a4accd398bdb402a2 (patch) | |
| tree | 976958bf8e4989a69901bfbb25dd6463728c6cb5 /include/linux/i2c/pca953x.h | |
| parent | 5e27fb78df95e027723af2c90ecc9b4527ae59e9 (diff) | |
| parent | d30e5d897c3da7c2d17c8112331b66ed953eec78 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
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 */ |