ar71xx: move the watchdog driver to the kernel

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 37289

diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile
index 69c562d0a2a5727897901b41b2efc3f4b2130386..28faddc04cdcc7912b63fe26184893c0b4e110e9 100644 (file)
--- a/target/linux/ar71xx/Makefile
+++ b/target/linux/ar71xx/Makefile
@@ -18,7 +18,7 @@ LINUX_VERSION:=3.10
 include $(INCLUDE_DIR)/target.mk
 
 DEFAULT_PACKAGES += \
-       kmod-leds-gpio kmod-gpio-button-hotplug kmod-wdt-ath79 swconfig \
+       kmod-leds-gpio kmod-gpio-button-hotplug swconfig \
        kmod-ledtrig-default-on kmod-ledtrig-timer kmod-ledtrig-netdev \
        kmod-ath9k wpad-mini uboot-envtools
 

diff --git a/target/linux/ar71xx/config-3.10 b/target/linux/ar71xx/config-3.10
index b6d065b475bb94daa1a9a768797a62a2f3c6c2db..5f4fe41222ebf8558cc54496f810b7c2cf9ea117 100644 (file)
--- a/target/linux/ar71xx/config-3.10
+++ b/target/linux/ar71xx/config-3.10
@@ -101,7 +101,7 @@ CONFIG_ATH79_MACH_ZCN_1523H=y
 CONFIG_ATH79_NVRAM=y
 CONFIG_ATH79_PCI_ATH9K_FIXUP=y
 # CONFIG_ATH79_ROUTERBOOT is not set
-# CONFIG_ATH79_WDT is not set
+CONFIG_ATH79_WDT=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CEVT_R4K=y
 CONFIG_CLONE_BACKWARDS=y

diff --git a/target/linux/ar71xx/modules.mk b/target/linux/ar71xx/modules.mk
index 601f473869c53e86c1b4deb15fff10aa745e70dc..83747d6ce234e69e191d2b7be1b77357dc32eb83 100644 (file)
--- a/target/linux/ar71xx/modules.mk
+++ b/target/linux/ar71xx/modules.mk
@@ -67,20 +67,3 @@ define KernelPackage/spi-vsc7385/description
 endef
 
 $(eval $(call KernelPackage,spi-vsc7385))
-
-
-define KernelPackage/wdt-ath79
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=Atheros AR7XXX/AR9XXX watchdog timer
-  DEPENDS:=@TARGET_ar71xx
-  KCONFIG:=CONFIG_ATH79_WDT
-  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/ath79_wdt.ko
-  AUTOLOAD:=$(call AutoLoad,50,ath79_wdt,1)
-endef
-
-define KernelPackage/wdt-ath79/description
-  Kernel module for AR7XXX/AR9XXX watchdog timer.
-endef
-
-$(eval $(call KernelPackage,wdt-ath79))
-