diff options
| author | Daniel Willerud <daniel.willerud@stericsson.com> | 2011-02-15 15:36:05 +0100 |
|---|---|---|
| committer | Jonas ABERG <jonas.aberg@stericsson.com> | 2011-02-17 15:36:28 +0100 |
| commit | d8bf3313d13f96fabe5a4509409860fe4d09798d (patch) | |
| tree | 8711dd2b64424019e540497668ab59da0c94001b | |
| parent | 788393606d6fcf81ded34612db0bddaee47cff2e (diff) | |
MFD: ab8500-gpadc rename driveru8500-android-2.3_v0.16
ST-Ericsson ID: ER281133
ST-Ericsson FOSS-OUT ID: Trivial
Signed-off-by: Daniel Willerud <daniel.willerud@stericsson.com>
Change-Id: Iffb6fba311fb44ad408de8ba24e83fd96b9b95a1
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/16124
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Reviewed-by: Johan PALSSON <johan.palsson@stericsson.com>
Reviewed-by: Mattias WALLIN <mattias.wallin@stericsson.com>
| -rw-r--r-- | drivers/mfd/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/mfd/Makefile | 1 | ||||
| -rw-r--r-- | drivers/mfd/ab8500-gpadc.c (renamed from drivers/misc/ab8500_gpadc.c) | 0 | ||||
| -rw-r--r-- | drivers/misc/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/misc/Makefile | 1 |
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index f4b981afe47..03ff74192c1 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -537,6 +537,13 @@ config AB8500_DEBUG Select this option if you want debug information using the debug filesystem, debugfs. +config AB8500_GPADC + bool "AB8500 GPADC driver" + depends on AB8500_CORE + default y + help + AB8500 GPADC driver used to convert Acc and battery/ac/usb voltage. + config AB3550_CORE bool "ST-Ericsson AB3550 Mixed Signal Circuit core functions" select MFD_CORE diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index db629c17d61..b8a5e87743f 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -72,6 +72,7 @@ obj-$(CONFIG_AB8500_CORE) += ab8500-core.o ab8500-sysctrl.o obj-$(CONFIG_AB8500_I2C_CORE) += ab8500-i2c.o obj-$(CONFIG_AB8500_DEBUG) += ab8500-debugfs.o obj-$(CONFIG_AB8500_DENC) += ab8500-denc.o +obj-$(CONFIG_AB8500_GPADC) += ab8500-gpadc.o obj-$(CONFIG_MFD_TIMBERDALE) += timberdale.o obj-$(CONFIG_PMIC_ADP5520) += adp5520.o obj-$(CONFIG_LPC_SCH) += lpc_sch.o diff --git a/drivers/misc/ab8500_gpadc.c b/drivers/mfd/ab8500-gpadc.c index 417912a68e3..417912a68e3 100644 --- a/drivers/misc/ab8500_gpadc.c +++ b/drivers/mfd/ab8500-gpadc.c diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index d6aaab0827f..1c7702180b5 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -435,13 +435,6 @@ config STE_TRACE_MODEM help Select this option to enable modem tracing by APE -config AB8500_GPADC - bool "AB8500 GPADC driver" - depends on AB8500_CORE - default y - help - AB8500 GPADC driver used to convert Acc and battery/ac/usb voltage - config HWMEM bool "Hardware memory driver" default n diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 82bb0e3693e..07ef4cbe6ca 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -41,7 +41,6 @@ obj-$(CONFIG_SENSORS_AK8975) += akm8975.o obj-$(CONFIG_HSI) += hsi/ obj-$(CONFIG_U8500_HSI_LEGACY) += hsi/hsi-legacy/ obj-$(CONFIG_STM_I2S) += i2s/ -obj-$(CONFIG_AB8500_GPADC) += ab8500_gpadc.o obj-$(CONFIG_STE_TRACE_MODEM) += db8500-modem-trace.o obj-$(CONFIG_ISA_HSI_MODEM) += msw/ obj-$(CONFIG_U8500_SHRM) += shrm/ |