diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2013-08-21 06:08:14 -0400 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-08-21 06:08:14 -0400 |
| commit | 828fa1e60117535d9b1e1b09444842ae66e8424d (patch) | |
| tree | 281f5bff9a12c760ca947a98569df63c8ca85909 /include/linux/mfd | |
| parent | 09fd86780bb4603df1886e17127f5beb97f70ffb (diff) | |
| parent | 8a105ca202b1a1061a24f1e980206cd2808e2f8b (diff) | |
Merge tag 'mfd-lee-3.12-1' of git://git.linaro.org/people/ljones/mfd
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/palmas.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h index d2fca1c6f7df..dd362df54799 100644 --- a/include/linux/mfd/palmas.h +++ b/include/linux/mfd/palmas.h | |||
| @@ -302,6 +302,7 @@ struct palmas_platform_data { | |||
| 302 | */ | 302 | */ |
| 303 | int mux_from_pdata; | 303 | int mux_from_pdata; |
| 304 | u8 pad1, pad2; | 304 | u8 pad1, pad2; |
| 305 | bool pm_off; | ||
| 305 | 306 | ||
| 306 | struct palmas_pmic_platform_data *pmic_pdata; | 307 | struct palmas_pmic_platform_data *pmic_pdata; |
| 307 | struct palmas_gpadc_platform_data *gpadc_pdata; | 308 | struct palmas_gpadc_platform_data *gpadc_pdata; |