summaryrefslogtreecommitdiffstats
path: root/arch/arm
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-14 09:39:33 +0200
commit74805e01f8f12aa2d1ba866fa471ff89d5363636 (patch)
tree83abb19422ddef10dced9ea7479a2194a8529822 /arch/arm
parent7418b5cc81185e4ae1fec66156c464eb0b8d8f5a (diff)
downloadlinux-74805e01f8f12aa2d1ba866fa471ff89d5363636.tar.bz2
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/arm')
-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