diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-15 19:57:04 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-15 19:57:04 +0200 |
commit | 4e4971edcd1f4c914591f46de9a3cf1c682d4361 (patch) | |
tree | 200534e1459837100585d8cfaff6b3530f0da0c0 /kernel-x86_64.config | |
parent | 3cf2fcb822b55f80a96b6c0c86ab41accdd50349 (diff) | |
parent | 10a3f2eb22d23a5a28b1e474bf2caa3f07d5f70a (diff) | |
download | kernel-5.1.18-350.vanilla.knurd.1.fc31.tar.gz kernel-5.1.18-350.vanilla.knurd.1.fc31.tar.xz kernel-5.1.18-350.vanilla.knurd.1.fc31.zip |
Merge remote-tracking branch 'origin/f30' into f30-user-thl-vanilla-fedorakernel-5.1.18-350.vanilla.knurd.1.fc31
Diffstat (limited to 'kernel-x86_64.config')
-rw-r--r-- | kernel-x86_64.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-x86_64.config b/kernel-x86_64.config index ef5038e3f..c45a4ecc6 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -253,7 +253,6 @@ CONFIG_ARCH_MULTIPLATFORM=y # CONFIG_ARCNET is not set CONFIG_ARM64_ERRATUM_858921=y # CONFIG_AS3935 is not set -# CONFIG_ASIX_PHY is not set CONFIG_ASUS_LAPTOP=m CONFIG_ASUS_NB_WMI=m CONFIG_ASUS_WIRELESS=m @@ -346,6 +345,7 @@ CONFIG_AUTOFS_FS=y CONFIG_AUXDISPLAY=y CONFIG_AX25_DAMA_SLAVE=y CONFIG_AX25=m +# CONFIG_AX88796B_PHY is not set # CONFIG_AXP20X_ADC is not set # CONFIG_AXP20X_POWER is not set CONFIG_AXP288_ADC=m |