diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-03-07 14:23:37 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-03-07 14:23:37 +0100 |
| commit | 8f397a4b163f6ee149837f0ab0dfd4081a720010 (patch) | |
| tree | dd8f34d7eb3dace62842e575b7b3a306f9b204b8 /arch/arm/configs | |
| parent | ce9cbae133c84c147bc6823f07c0b55bf4012837 (diff) | |
| parent | 9fd32f5a4e8d25fb8985fec86bc03f3743820f0e (diff) | |
| download | barebox-8f397a4b163f6ee149837f0ab0dfd4081a720010.tar.gz barebox-8f397a4b163f6ee149837f0ab0dfd4081a720010.tar.xz | |
Merge branch 'for-next/rpi'
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/rpi_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/rpi_defconfig b/arch/arm/configs/rpi_defconfig index dc5ab1fe17..f167625c96 100644 --- a/arch/arm/configs/rpi_defconfig +++ b/arch/arm/configs/rpi_defconfig @@ -71,8 +71,8 @@ CONFIG_LED_GPIO=y CONFIG_LED_TRIGGERS=y CONFIG_WATCHDOG=y CONFIG_WATCHDOG_BCM2835=y -CONFIG_GPIO_BCM283X=y -# CONFIG_PINCTRL is not set +CONFIG_PINCTRL=y +CONFIG_PINCTRL_BCM283X=y CONFIG_REGULATOR=y CONFIG_FS_EXT4=y CONFIG_FS_FAT=y |