diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-08-15 13:21:56 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-08-15 13:21:56 +1000 |
| commit | ef893a1eaebcd15e1efba29dc9eb4ecf4b41094d (patch) | |
| tree | 66138dfaaeae36c1ce89bedc9998a149c4bc6efd /arch/arm64 | |
| parent | 0e1267d414d35423450b41a539e7d607edc227d1 (diff) | |
| parent | fe8166c92a5f154c60fb2741afd247ae7716a6d3 (diff) | |
| download | linux-next-ef893a1eaebcd15e1efba29dc9eb4ecf4b41094d.tar.gz | |
Merge remote-tracking branch 'mfd/for-mfd-next'
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/configs/defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 1982170eda1c..80f9e7f1169f 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -379,8 +379,8 @@ CONFIG_BCM2835_WDT=y CONFIG_MFD_BD9571MWV=y CONFIG_MFD_AXP20X_RSB=y CONFIG_MFD_CROS_EC=y -CONFIG_MFD_CROS_EC_I2C=y -CONFIG_MFD_CROS_EC_SPI=y +CONFIG_CROS_EC_I2C=y +CONFIG_CROS_EC_SPI=y CONFIG_MFD_CROS_EC_CHARDEV=m CONFIG_MFD_EXYNOS_LPASS=m CONFIG_MFD_HI6421_PMIC=y |