diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-09-17 18:12:15 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-09-17 18:12:15 +0200 |
| commit | 20afbe1cdd218f149a773c01945893c353fa2c60 (patch) | |
| tree | 0e0526ab848c717a7971728347f62a81d1ca9a1b /kernel-armv7hl.config | |
| parent | 93bf93308b5aad49a6575406966b3ab2047e14d3 (diff) | |
| parent | a54055adb14a40ada848c9ef6677cecbc58939e2 (diff) | |
| download | kernel-20afbe1cdd218f149a773c01945893c353fa2c60.tar.gz kernel-20afbe1cdd218f149a773c01945893c353fa2c60.tar.xz kernel-20afbe1cdd218f149a773c01945893c353fa2c60.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc30kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc29kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc28kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel-armv7hl.config')
| -rw-r--r-- | kernel-armv7hl.config | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 73b9a11c9..368aca682 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1742,7 +1742,7 @@ CONFIG_EEPROM_IDT_89HPESX=m CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m # CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT is not set -# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set +CONFIG_EFI_ARMSTUB_DTB_LOADER=y # CONFIG_EFI_BOOTLOADER_CONTROL is not set # CONFIG_EFI_CAPSULE_LOADER is not set CONFIG_EFI_PARTITION=y @@ -1768,6 +1768,7 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m +# CONFIG_EROFS_FS is not set CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m @@ -3267,7 +3268,6 @@ CONFIG_MACH_MESON8B=y CONFIG_MACH_MMP2_DT=y # CONFIG_MACH_OMAP3517EVM is not set # CONFIG_MACH_OMAP3_PANDORA is not set -# CONFIG_MACH_OMAP_LDP is not set CONFIG_MACH_SUN4I=y CONFIG_MACH_SUN5I=y CONFIG_MACH_SUN6I=y @@ -4693,7 +4693,7 @@ CONFIG_PINCTRL_APQ8064=m CONFIG_PINCTRL_APQ8084=m CONFIG_PINCTRL_ARMADA_370=y CONFIG_PINCTRL_ARMADA_XP=y -CONFIG_PINCTRL_AS3722=y +CONFIG_PINCTRL_AS3722=m CONFIG_PINCTRL_AXP209=m # CONFIG_PINCTRL_BAYTRAIL is not set # CONFIG_PINCTRL_BROXTON is not set @@ -5205,7 +5205,7 @@ CONFIG_RTC_DRV_88PM80X=m CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_AC100=m CONFIG_RTC_DRV_ARMADA38X=m -CONFIG_RTC_DRV_AS3722=y +CONFIG_RTC_DRV_AS3722=m CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y |