X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Famazon%2FMakefile;h=5a5fed598de88f851bd8acc7b06049f76de1fdf0;hb=b1d12c1feb88218b3d60dc61a16380ee09be90a2;hp=b8491c2fd2cb151ebac9942c1533476af62ac175;hpb=6665a2c1dc316cf1ebb8bc1b0ef4a44d152b0764;p=openwrt-github%2F.git

diff --git a/target/linux/amazon/Makefile b/target/linux/amazon/Makefile
index b8491c2fd2..5a5fed598d 100644
--- 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.21.7
 
 include $(INCLUDE_DIR)/target.mk
 
@@ -18,6 +18,12 @@ define Target/Description
 	Build firmware images for Infineon Amazon boards
 endef
 
-KERNELNAME:="uImage"
+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))