Merge master into staging-next

2021-04-04 18:13:55 +00:00
parent 3e45982f7a 7d0ba0850f
commit 8277f3982e
7 changed files with 24 additions and 35 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