commit 77d106ea896f3c77515fb982e35c96d0861d8928
author Siddartha Mohanadoss <smohanad@codeaurora.org> Tue Sep 20 16:25:59 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Tue Oct 04 17:14:12 2011 -0700
tree 42bd300a872239ec3dd2d7efe2b919fac4062b6d
parent 43e46a32dec07e5179fda7400b77b16c81b70d88

hwmon: pm8921-adc: Add sysfs interface

-Add sysfs interface to read PM8921 HK/XOADC
and thermistor temperature measurements mapped
through MPP's.
-Move PM8921 ADC from directory /drivers/mfd to
/drivers/hwmon for userspace clients to read ADC
through hwmon.

CRs-Fixed: 302365
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>

Conflicts:

	drivers/mfd/Kconfig

drivers/thermal/pm8xxx-tm.c

diff --git a/drivers/thermal/pm8xxx-tm.c b/drivers/thermal/pm8xxx-tm.c
index a094aed..d9f9c9e 100644
--- a/drivers/thermal/pm8xxx-tm.c
+++ b/drivers/thermal/pm8xxx-tm.c
@@ -29,7 +29,7 @@
 #include <linux/mfd/pm8xxx/core.h>
 #include <linux/mfd/pm8xxx/tm.h>
 #include <linux/completion.h>
-#include <linux/mfd/pm8921-adc.h>
+#include <linux/mfd/pm8xxx/pm8921-adc.h>
 
 /* Register TEMP_ALARM_CTRL bits */
 #define	TEMP_ALARM_CTRL_ST3_SD		0x80