From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 6 Feb 2008 07:41:04 +0000 (+0000)
Subject: add a workaround for watchdog path changes
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=3fed3f7a5893df388a49871b812b2738958c68f7

add a workaround for watchdog path changes


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10403 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 59d0e9208..5f82c8a66 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -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