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

include/linux/mfd/pm8xxx/pm8921.h

diff --git a/include/linux/mfd/pm8xxx/pm8921.h b/include/linux/mfd/pm8xxx/pm8921.h
index 36f6fc9..bde5bbc 100644
--- a/include/linux/mfd/pm8xxx/pm8921.h
+++ b/include/linux/mfd/pm8xxx/pm8921.h
@@ -31,7 +31,7 @@
 #include <linux/input/pmic8xxx-keypad.h>
 #include <linux/regulator/pm8921-regulator.h>
 #include <linux/mfd/pm8xxx/pm8921-charger.h>
-#include <linux/mfd/pm8921-adc.h>
+#include <linux/mfd/pm8xxx/pm8921-adc.h>
 #include <linux/mfd/pm8xxx/pm8921-bms.h>
 #include <linux/leds.h>
 #include <linux/mfd/pm8xxx/vibrator.h>