diff --git a/package/kernel/gpio-nct5104d/Makefile b/package/kernel/gpio-nct5104d/Makefile
index e85639c94..663af3fc0 100644
--- a/package/kernel/gpio-nct5104d/Makefile
+++ b/package/kernel/gpio-nct5104d/Makefile
@@ -29,22 +29,10 @@ define KernelPackage/gpio-nct5104d/description
   Support for GPIO functionality of NCT5104D super I/O chip.
 endef
 
-EXTRA_KCONFIG:= \
-	CONFIG_GPIO_NCT5104D=m
-
-EXTRA_CFLAGS:= \
-	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \
-	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG)))) \
-
-MAKE_OPTS:= \
-	$(KERNEL_MAKE_FLAGS) \
-	M="$(PKG_BUILD_DIR)" \
-	EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
-	$(EXTRA_KCONFIG)
-
 define Build/Compile
 	 $(MAKE) -C "$(LINUX_DIR)" \
-		$(MAKE_OPTS) \
+		$(KERNEL_MAKE_FLAGS) \
+		M="$(PKG_BUILD_DIR)" \
 		modules
 endef
 
diff --git a/package/kernel/gpio-nct5104d/src/Kconfig b/package/kernel/gpio-nct5104d/src/Kconfig
deleted file mode 100644
index cf658e29c..000000000
--- a/package/kernel/gpio-nct5104d/src/Kconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-config GPIO_NCT5104D
-        tristate "NCT5104D GPIO support"
-        depends on GENERIC_GPIO
-        help
-          Say yes here to support GPIO functionality of NCT5104D super I/O chip
diff --git a/package/kernel/gpio-nct5104d/src/Makefile b/package/kernel/gpio-nct5104d/src/Makefile
index 6f0375a34..9845c68c3 100644
--- a/package/kernel/gpio-nct5104d/src/Makefile
+++ b/package/kernel/gpio-nct5104d/src/Makefile
@@ -1 +1 @@
-obj-${CONFIG_GPIO_NCT5104D}    += gpio-nct5104d.o
+obj-m += gpio-nct5104d.o
diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index 97873a0bc..c02be04ed 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -1290,6 +1290,7 @@ define KernelPackage/wireguard
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=WireGuard secure network tunnel
   DEPENDS:= \
+	  +kmod-crypto-lib-blake2s \
 	  +kmod-crypto-lib-chacha20poly1305 \
 	  +kmod-crypto-lib-curve25519 \
 	  +kmod-udptunnel4 \