diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-07-14 14:05:08 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-07-14 14:05:08 +0000 |
| commit | aad55d92d68c1d537e7d50520a7ef6eeba97db39 (patch) | |
| tree | e726be6bbd318cb8998bccbc14975e9f16e52b60 /target/linux | |
| parent | 215f8e9d8e7cf3a77a64dae64187fdce85d5bf90 (diff) | |
| download | upstream-aad55d92d68c1d537e7d50520a7ef6eeba97db39.tar.gz upstream-aad55d92d68c1d537e7d50520a7ef6eeba97db39.tar.bz2 upstream-aad55d92d68c1d537e7d50520a7ef6eeba97db39.zip | |
ar71xx: move the watchdog driver to the kernel
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37289 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/ar71xx/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/ar71xx/config-3.10 | 2 | ||||
| -rw-r--r-- | target/linux/ar71xx/modules.mk | 17 |
3 files changed, 2 insertions, 19 deletions
diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index 69c562d0a2..28faddc04c 100644 --- 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 b6d065b475..5f4fe41222 100644 --- 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 601f473869..83747d6ce2 100644 --- 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)) - |