diff options
| author | Daniel Willerud <daniel.willerud@stericsson.com> | 2011-03-05 11:46:01 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-03-23 10:42:03 +0100 |
| commit | cf16943947cef089c564d2be0ae9d96a285f495e (patch) | |
| tree | f774d0fb4208f92c1466575fdcf778ba6a75df04 | |
| parent | 527e7e9a82ec95cdb8f694855004b3d262efd09f (diff) | |
mfd: Move ab8500 gpadc header to subdir
This moves the ab8500-gpadc.h header down into the ab8500/
subdir in include/linux/mfd and fixes some whitespace in the
header in the process.
Signed-off-by: Daniel Willerud <daniel.willerud@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| -rw-r--r-- | drivers/mfd/ab8500-gpadc.c | 2 | ||||
| -rw-r--r-- | include/linux/mfd/ab8500/ab8500-gpadc.h (renamed from include/linux/mfd/ab8500-gpadc.h) | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c index 19339bc439c..f60f71f4b47 100644 --- a/drivers/mfd/ab8500-gpadc.c +++ b/drivers/mfd/ab8500-gpadc.c @@ -17,7 +17,7 @@ #include <linux/slab.h> #include <linux/mfd/ab8500.h> #include <linux/mfd/abx500.h> -#include <linux/mfd/ab8500-gpadc.h> +#include <linux/mfd/ab8500/ab8500-gpadc.h> /* * GPADC register offsets diff --git a/include/linux/mfd/ab8500-gpadc.h b/include/linux/mfd/ab8500/ab8500-gpadc.h index 9f6cc26bc73..74b87dde9cd 100644 --- a/include/linux/mfd/ab8500-gpadc.h +++ b/include/linux/mfd/ab8500/ab8500-gpadc.h @@ -9,19 +9,19 @@ #define _AB8500_GPADC_H /* GPADC source: From datasheet(ADCSwSel[4:0] in GPADCCtrl2) */ -#define BAT_CTRL 0x01 -#define BTEMP_BALL 0x02 -#define MAIN_CHARGER_V 0x03 -#define ACC_DETECT1 0x04 -#define ACC_DETECT2 0x05 +#define BAT_CTRL 0x01 +#define BTEMP_BALL 0x02 +#define MAIN_CHARGER_V 0x03 +#define ACC_DETECT1 0x04 +#define ACC_DETECT2 0x05 #define ADC_AUX1 0x06 #define ADC_AUX2 0x07 -#define MAIN_BAT_V 0x08 -#define VBUS_V 0x09 -#define MAIN_CHARGER_C 0x0A -#define USB_CHARGER_C 0x0B -#define BK_BAT_V 0x0C -#define DIE_TEMP 0x0D +#define MAIN_BAT_V 0x08 +#define VBUS_V 0x09 +#define MAIN_CHARGER_C 0x0A +#define USB_CHARGER_C 0x0B +#define BK_BAT_V 0x0C +#define DIE_TEMP 0x0D int ab8500_gpadc_convert(u8 input); |