diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-11 13:51:25 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-11 13:51:25 +0100 |
| commit | b0ebdcd763479064f968d7c9c75fb98eb42f9c69 (patch) | |
| tree | 42b232e3d0b70d871fabbb26430a7e55140c5d9f /kernel-i686-debug-fedora.config | |
| parent | c770d83fd262798bbed608a855df6388ccd93e4d (diff) | |
| parent | 90f94e196fa383fb2c105567231d414fb39e6d70 (diff) | |
| download | kernel-b0ebdcd763479064f968d7c9c75fb98eb42f9c69.tar.gz kernel-b0ebdcd763479064f968d7c9c75fb98eb42f9c69.tar.xz kernel-b0ebdcd763479064f968d7c9c75fb98eb42f9c69.zip | |
Merge remote-tracking branch 'origin/stabilization' into stabilization-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-i686-debug-fedora.config')
| -rw-r--r-- | kernel-i686-debug-fedora.config | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 042328859..9cfceac7e 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -202,7 +202,6 @@ CONFIG_ALIENWARE_WMI=m CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m # CONFIG_ALIX is not set -CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y # CONFIG_ALTERA_FREEZE_BRIDGE is not set # CONFIG_ALTERA_MBOX is not set CONFIG_ALTERA_MSGDMA=m @@ -5150,7 +5149,7 @@ CONFIG_SERIO=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set -CONFIG_SFI=y +# CONFIG_SFI is not set # CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y |