X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/64f4da969a36451048b97f1eeb90b335b1646402..e6a5f54f743435e08ac6288716a905c0dd3d4dfd:/package/kernel/modules/other.mk

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index ebf4d066c..5f82c8a66 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -63,7 +63,7 @@ define KernelPackage/pcmcia-core
   DEPENDS:=@PCMCIA_SUPPORT
   KCONFIG:= \
 	CONFIG_PCMCIA \
-	CONFIG_CARDBUS
+	CONFIG_CARDBUS \
 	CONFIG_PCCARD \
 	CONFIG_YENTA \
 	CONFIG_PCCARD_NONSTATIC \
@@ -230,21 +230,23 @@ endef
 $(eval $(call KernelPackage,mmc))
 
 
+# XXX: added a workaround for watchdog path changes
+ifeq ($(KERNEL),2.4)
+  WATCHDOG_DIR=char
+endif
+ifeq ($(KERNEL_PATCHVER),2.6.24)
+  WATCHDOG_DIR=watchdog
+endif
+WATCHDOG_DIR?=char/watchdog
+
 define KernelPackage/softdog
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Software watchdog driver
   KCONFIG:=CONFIG_SOFT_WATCHDOG
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/softdog.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,softdog)
 endef
 
-define KernelPackage/softdog/2.4
-  FILES:=$(LINUX_DIR)/drivers/char/softdog.o
-endef
-
-define KernelPackage/softdog/2.6
-  FILES:=$(LINUX_DIR)/drivers/char/watchdog/softdog.ko
-endef
-
 define KernelPackage/softdog/description
  Software watchdog driver
 endef