Merge tag 'mfd-lee-3.12-1' of git://git.linaro.org/people/ljones/mfd

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2013-08-21 12:08:14 +02:00
parent 09fd86780b 8a105ca202
commit 828fa1e601
71 changed files with 235 additions and 153 deletions
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -302,6 +302,7 @@ struct palmas_platform_data {
 	 */
 	int mux_from_pdata;
 	u8 pad1, pad2;
+	bool pm_off;

 	struct palmas_pmic_platform_data *pmic_pdata;
 	struct palmas_gpadc_platform_data *gpadc_pdata;