summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/Makefile
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2017-04-04 15:38:56 +0300
committerLee Jones <lee.jones@linaro.org>2017-04-27 11:54:42 +0100
commitb5238b41858229b2dcb684cd71d81f4c6d6311c0 (patch)
tree3a3032325b3bb79f4fc09c3380cf189139e1280a /drivers/mfd/Makefile
parent90f447170c6f283a80a729ff92aabecdb2206cbe (diff)
downloadlinux-stable-b5238b41858229b2dcb684cd71d81f4c6d6311c0.tar.gz
linux-stable-b5238b41858229b2dcb684cd71d81f4c6d6311c0.tar.bz2
linux-stable-b5238b41858229b2dcb684cd71d81f4c6d6311c0.zip
mfd: intel_soc_pmic: Fix a mess with compilation units
Crystal Cove and Whiskey Cove are two different PMICs which are installed on Intel Atom SoC based platforms. Moreover there are two independent drivers that by some reason were supposed (*) to get into one kernel module. Fix the mess by clarifying Kconfig option for Crystal Cove and split Whiskey Cove out of it. (*) It looks like the configuration was never tested with INTEL_SOC_PMIC=n. The line in Makefile is actually wrong. Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> (supporter:ACPI) Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/Makefile')
-rw-r--r--drivers/mfd/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index fa86dbe65e52..c16bf1ea0ea9 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -212,8 +212,8 @@ obj-$(CONFIG_MFD_RT5033) += rt5033.o
obj-$(CONFIG_MFD_SKY81452) += sky81452.o
intel-soc-pmic-objs := intel_soc_pmic_core.o intel_soc_pmic_crc.o
-intel-soc-pmic-$(CONFIG_INTEL_PMC_IPC) += intel_soc_pmic_bxtwc.o
obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o
+obj-$(CONFIG_INTEL_SOC_PMIC_BXTWC) += intel_soc_pmic_bxtwc.o
obj-$(CONFIG_MFD_MT6397) += mt6397-core.o
obj-$(CONFIG_MFD_ALTERA_A10SR) += altera-a10sr.o