diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-03 20:26:21 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-03 20:26:21 +0100 |
| commit | 799a33117bbf192b17db34a37c53e1e7476b1022 (patch) | |
| tree | 286adb46ca2e4b163805e2fe1903b92a8c10a262 /kernel-i686-fedora.config | |
| parent | 536a66c180f3c645134fd451423ac99a2bb278ab (diff) | |
| parent | 7e8e0b495bfcdb4920298120021823637859fedc (diff) | |
| download | kernel-799a33117bbf192b17db34a37c53e1e7476b1022.tar.gz kernel-799a33117bbf192b17db34a37c53e1e7476b1022.tar.xz kernel-799a33117bbf192b17db34a37c53e1e7476b1022.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.5.0-0.rc0.git4.1.vanilla.knurd.1.fc32kernel-5.5.0-0.rc0.git4.1.vanilla.knurd.1.fc31kernel-5.5.0-0.rc0.git4.1.vanilla.knurd.1.fc30
Diffstat (limited to 'kernel-i686-fedora.config')
| -rw-r--r-- | kernel-i686-fedora.config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 29639c202..7aabd2cdb 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -5136,6 +5136,7 @@ CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set CONFIG_SFI=y +# CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y CONFIG_SHUFFLE_PAGE_ALLOCATOR=y |