diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-16 06:04:56 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-16 06:04:56 +0200 |
commit | 8f10a58c6f49ed9a65b01336fc1084d150c00c08 (patch) | |
tree | acae71b201056da29c2057d65b0dd760e869c8a6 /kernel-i686.config | |
parent | ba5ae2e5ab78b18e88c240ed92ee8a192776e5bd (diff) | |
parent | 3d93a416f2530b59aec1497d1e1daed24a5de3a7 (diff) | |
download | kernel-8f10a58c6f49ed9a65b01336fc1084d150c00c08.tar.gz kernel-8f10a58c6f49ed9a65b01336fc1084d150c00c08.tar.xz kernel-8f10a58c6f49ed9a65b01336fc1084d150c00c08.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-i686.config')
-rw-r--r-- | kernel-i686.config | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel-i686.config b/kernel-i686.config index 25540cda5..ec3648d62 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -1602,11 +1602,6 @@ CONFIG_FIREWIRE_SBP2=m CONFIG_FIXED_PHY=y # CONFIG_FLATMEM_MANUAL is not set CONFIG_FM10K=m -CONFIG_FMC_CHARDEV=m -CONFIG_FMC_FAKEDEV=m -CONFIG_FMC=m -CONFIG_FMC_TRIVIAL=m -CONFIG_FMC_WRITE_EEPROM=m # CONFIG_FONTS is not set CONFIG_FORCEDETH=m CONFIG_FORTIFY_SOURCE=y |