diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-07-25 00:31:09 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-07-25 00:34:40 -0400 |
| commit | 6aeea3ecc33b1f36dbc3b80461d15a7052ae424f (patch) | |
| tree | bbd273e3e0ca76094aed8e9c77e5adfe2b07f779 /include/linux/mfd/abx500/ab8500.h | |
| parent | 9844a5524ec532aee826c35e3031637c7fc8287b (diff) | |
| parent | bdc0077af574800d24318b6945cf2344e8dbb050 (diff) | |
Merge remote-tracking branch 'origin' into irqdomain/next
Diffstat (limited to 'include/linux/mfd/abx500/ab8500.h')
| -rw-r--r-- | include/linux/mfd/abx500/ab8500.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h index 91dd3ef63e99..bc9b84b60ec6 100644 --- a/include/linux/mfd/abx500/ab8500.h +++ b/include/linux/mfd/abx500/ab8500.h | |||
| @@ -266,6 +266,7 @@ struct ab8500 { | |||
| 266 | struct regulator_reg_init; | 266 | struct regulator_reg_init; |
| 267 | struct regulator_init_data; | 267 | struct regulator_init_data; |
| 268 | struct ab8500_gpio_platform_data; | 268 | struct ab8500_gpio_platform_data; |
| 269 | struct ab8500_codec_platform_data; | ||
| 269 | 270 | ||
| 270 | /** | 271 | /** |
| 271 | * struct ab8500_platform_data - AB8500 platform data | 272 | * struct ab8500_platform_data - AB8500 platform data |
| @@ -284,6 +285,7 @@ struct ab8500_platform_data { | |||
| 284 | int num_regulator; | 285 | int num_regulator; |
| 285 | struct regulator_init_data *regulator; | 286 | struct regulator_init_data *regulator; |
| 286 | struct ab8500_gpio_platform_data *gpio; | 287 | struct ab8500_gpio_platform_data *gpio; |
| 288 | struct ab8500_codec_platform_data *codec; | ||
| 287 | }; | 289 | }; |
| 288 | 290 | ||
| 289 | extern int __devinit ab8500_init(struct ab8500 *ab8500, | 291 | extern int __devinit ab8500_init(struct ab8500 *ab8500, |