Skip to content

Commit 79e1b81

Browse files
author
Shawn Guo
committed
Merge branch 'imx/defconfig' into for-next
2 parents 959d86a + 7f66e52 commit 79e1b81

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

arch/arm64/configs/defconfig

+3
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,7 @@ CONFIG_GPIO_XGENE_SB=y
655655
CONFIG_GPIO_MAX732X=y
656656
CONFIG_GPIO_PCA953X=y
657657
CONFIG_GPIO_PCA953X_IRQ=y
658+
CONFIG_GPIO_ADP5585=m
658659
CONFIG_GPIO_BD9571MWV=m
659660
CONFIG_GPIO_MAX77620=y
660661
CONFIG_GPIO_SL28CPLD=m
@@ -736,6 +737,7 @@ CONFIG_UNIPHIER_WATCHDOG=y
736737
CONFIG_PM8916_WATCHDOG=m
737738
CONFIG_BCM2835_WDT=y
738739
CONFIG_BCM7038_WDT=m
740+
CONFIG_MFD_ADP5585=m
739741
CONFIG_MFD_ALTERA_SYSMGR=y
740742
CONFIG_MFD_BD9571MWV=y
741743
CONFIG_MFD_AXP20X_I2C=y
@@ -1484,6 +1486,7 @@ CONFIG_IIO_ST_MAGN_3AXIS=m
14841486
CONFIG_IIO_CROS_EC_BARO=m
14851487
CONFIG_MPL3115=m
14861488
CONFIG_PWM=y
1489+
CONFIG_PWM_ADP5585=m
14871490
CONFIG_PWM_BCM2835=m
14881491
CONFIG_PWM_BRCMSTB=m
14891492
CONFIG_PWM_CROS_EC=m

0 commit comments

Comments
 (0)