From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sherman Yin Subject: [PATCH v3 2/3] Update bcm_defconfig with new pinctrl CONFIG Date: Wed, 2 Apr 2014 15:40:38 -0700 Message-ID: <1396478439-16586-3-git-send-email-syin@broadcom.com> References: <1390509887-19278-1-git-send-email-syin@broadcom.com> <1396478439-16586-1-git-send-email-syin@broadcom.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <1396478439-16586-1-git-send-email-syin@broadcom.com> Sender: linux-kernel-owner@vger.kernel.org To: Mark Brown , =?UTF-8?q?Heiko=20St=C3=BCbner?= , Pawel Moll , Mark Rutland , Stephen Warren , Ian Campbell , Rob Landley , Christian Daudt , Russell King , Linus Walleij , Grant Likely , Matt Porter , Olof Johansson Cc: devicetree@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, Sherman Yin List-Id: devicetree@vger.kernel.org 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 --- arch/arm/configs/bcm_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig index 2519d6d..b4d3013 100644 --- a/arch/arm/configs/bcm_defconfig +++ b/arch/arm/configs/bcm_defconfig @@ -125,7 +125,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 -- 1.7.9.5