Merge staging-next into staging

2021-04-05 05:11:50 +10:00
parent 5f24024de6 8277f3982e
commit 2361318ade
7 changed files with 22 additions and 33 deletions
@@ -75,6 +75,7 @@ stdenv.mkDerivation rec {
    CONFIG_P2P=y
    CONFIG_TDLS=y
    CONFIG_BGSCAN_SIMPLE=y
+    CONFIG_BGSCAN_LEARN=y
  '' + optionalString (pcsclite != null) ''
    CONFIG_EAP_SIM=y
    CONFIG_EAP_AKA=y