ar71xx: merge DSA switch patch

[openwrt.git] / target / linux / amazon / Makefile

diff --git a/target/linux/amazon/Makefile b/target/linux/amazon/Makefile
index 17f9d96..826937a 100644 (file)
--- a/target/linux/amazon/Makefile
+++ b/target/linux/amazon/Makefile
@@ -10,7 +10,7 @@ ARCH:=mips
 BOARD:=amazon
 BOARDNAME:=Infineon Amazon
 FEATURES:=squashfs jffs2 broken
-LINUX_VERSION:=2.6.21.5
+LINUX_VERSION:=2.6.30.10
 
 include $(INCLUDE_DIR)/target.mk
 
@@ -18,9 +18,12 @@ define Target/Description
        Build firmware images for Infineon Amazon boards
 endef
 
-KERNELNAME:="uImage"
-
-# include the profiles
--include profiles/*.mk
+ifeq ($(KERNEL_PATCHVER),2.6.30)
+  define Kernel/Prepare
+       $(call Kernel/Prepare/Default)
+       mv $(LINUX_DIR)/include/asm-mips/mach-amazon $(LINUX_DIR)/arch/mips/include/asm/mach-amazon
+       mv $(LINUX_DIR)/drivers/char/watchdog/amazon_wdt.c $(LINUX_DIR)/drivers/watchdog/amazon_wdt.c
+  endef
+endif
 
 $(eval $(call BuildTarget))