summaryrefslogtreecommitdiff
path: root/arch/arm/configs/pxa_defconfig
diff options
context:
space:
mode:
authorJacek Anaszewski <j.anaszewski@samsung.com>2016-11-22 15:52:06 +0300
committerJacek Anaszewski <j.anaszewski@samsung.com>2016-11-22 15:52:06 +0300
commit2a4f8114f21395d48958c3017ae8a091d9ae41d1 (patch)
tree5a91b754e76db370a9a38a36fa6a56c4b383e974 /arch/arm/configs/pxa_defconfig
parenteb1610b4c273370f491c5e194e5a56e3470d81e8 (diff)
parent40a3a0f2ba633fa219f69aef0fd0dcdd6e5756b0 (diff)
downloadlinux-2a4f8114f21395d48958c3017ae8a091d9ae41d1.tar.xz
Merge tag 'ib-mfd-arm-leds-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into linux-leds/for-next
Pull PM8XXX namespace cleanup from Lee Jones. * tag 'ib-mfd-arm-leds-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: mfd: qcom-pm8xxx: Clean up PM8XXX namespace
Diffstat (limited to 'arch/arm/configs/pxa_defconfig')
-rw-r--r--arch/arm/configs/pxa_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig
index a016ecc0084b..e4314b1227a3 100644
--- a/arch/arm/configs/pxa_defconfig
+++ b/arch/arm/configs/pxa_defconfig
@@ -411,7 +411,6 @@ CONFIG_MFD_MAX77693=y
CONFIG_MFD_MAX8907=m
CONFIG_EZX_PCAP=y
CONFIG_UCB1400_CORE=m
-CONFIG_MFD_PM8921_CORE=m
CONFIG_MFD_SEC_CORE=y
CONFIG_MFD_PALMAS=y
CONFIG_MFD_TPS65090=y