summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSherman Yin <syin@broadcom.com>2014-04-02 15:40:38 -0700
committerLinus Walleij <linus.walleij@linaro.org>2014-04-10 18:52:33 +0200
commit318179af124cfc429b915461a7f1adbde607c92e (patch)
treea10ef302bb5dd5c2f8f428c4c0cd1254c8da9c08 /arch
parente984097481690b23e8ddc7201f2001dea3f302d0 (diff)
Update bcm_defconfig with new pinctrl CONFIG
To be consistent with other Broadcom drivers, the Broadcom Capri pinctrl driver and its related CONFIG option are renamed to bcm281xx. This commit updates the defconfig that enables the pinctrl driver. Signed-off-by: Sherman Yin <syin@broadcom.com> Reviewed-by: Matt Porter <mporter@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/bcm_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig
index 01004640ee4d..3df3f3a79ef4 100644
--- a/arch/arm/configs/bcm_defconfig
+++ b/arch/arm/configs/bcm_defconfig
@@ -132,7 +132,7 @@ CONFIG_CRC_ITU_T=y
CONFIG_CRC7=y
CONFIG_XZ_DEC=y
CONFIG_AVERAGE=y
-CONFIG_PINCTRL_CAPRI=y
+CONFIG_PINCTRL_BCM281XX=y
CONFIG_WATCHDOG=y
CONFIG_BCM_KONA_WDT=y
CONFIG_BCM_KONA_WDT_DEBUG=y