Message ID | 1396478439-16586-3-git-send-email-syin@broadcom.com |
---|---|
State | Accepted |
Commit | 74805e01f8f12aa2d1ba866fa471ff89d5363636 |
Headers | show |
On Wed, Apr 02, 2014 at 03:40:38PM -0700, Sherman Yin wrote: > 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> Acked-by: Matt Porter <mporter@linaro.org> > --- > 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 > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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