From: Sherman Yin Date: Wed, 2 Apr 2014 22:40:38 +0000 (-0700) Subject: Update bcm_defconfig with new pinctrl CONFIG X-Git-Tag: v4.9.8~6532^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=74805e01f8f12aa2d1ba866fa471ff89d5363636;p=platform%2Fkernel%2Flinux-rpi3.git 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 Reviewed-by: Matt Porter Acked-by: Linus Walleij Signed-off-by: Linus Walleij --- diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig index 0100464..3df3f3a 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