summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/Makefile
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-05-19 17:21:37 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2012-05-20 17:27:10 +0200
commitd28f1db8187dd1ddc1fa6f380ff0402cf8e4d44d (patch)
treee736cddf25b387da59b3a8d0a65c257f87e158c6 /drivers/mfd/Makefile
parent1cb3642a68c983ada0f4090a4dac1d70a96126ca (diff)
downloadop-kernel-dev-d28f1db8187dd1ddc1fa6f380ff0402cf8e4d44d.zip
op-kernel-dev-d28f1db8187dd1ddc1fa6f380ff0402cf8e4d44d.tar.gz
mfd: Remove confusing ab8500-i2c file and merge into ab8500-core
ab8500-i2c is used as core code to register the ab8500 device. After allocating ab8500 memory, it immediately calls into ab8500-core where the real initialisation takes place. This patch moves all core registration and memory allocation into the true ab8500-core file and removes ab8500-i2c completely. Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/Makefile')
-rw-r--r--drivers/mfd/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index d713851..afe96b2 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -93,12 +93,11 @@ obj-$(CONFIG_AB3100_CORE) += ab3100-core.o
obj-$(CONFIG_AB3100_OTP) += ab3100-otp.o
obj-$(CONFIG_AB5500_CORE) += ab5500-core.o
obj-$(CONFIG_AB5500_DEBUG) += ab5500-debugfs.o
-obj-$(CONFIG_AB8500_CORE) += ab8500-core.o ab8500-sysctrl.o
obj-$(CONFIG_AB8500_DEBUG) += ab8500-debugfs.o
obj-$(CONFIG_AB8500_GPADC) += ab8500-gpadc.o
obj-$(CONFIG_MFD_DB8500_PRCMU) += db8500-prcmu.o
-# ab8500-i2c need to come after db8500-prcmu (which provides the channel)
-obj-$(CONFIG_AB8500_I2C_CORE) += ab8500-i2c.o
+# ab8500-core need to come after db8500-prcmu (which provides the channel)
+obj-$(CONFIG_AB8500_CORE) += ab8500-core.o ab8500-sysctrl.o
obj-$(CONFIG_MFD_DB5500_PRCMU) += db5500-prcmu.o
obj-$(CONFIG_MFD_TIMBERDALE) += timberdale.o
obj-$(CONFIG_PMIC_ADP5520) += adp5520.o
OpenPOWER on IntegriCloud