X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Famazon%2FMakefile;h=d0787ca25c29e2f8bb556cfdd7dca2fe8e9e701c;hb=3bea333001b3e3bbfea5cb1411accb1903506c18;hp=cca8a415fabb1f8864971db9f8f682b5341a0841;hpb=c502c5c38191a943298b93c65f76a562e5b62854;p=openwrt-10.03%2F.git

diff --git a/target/linux/amazon/Makefile b/target/linux/amazon/Makefile
index cca8a415f..d0787ca25 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.7
+LINUX_VERSION:=2.6.30.9
 
 include $(INCLUDE_DIR)/target.mk
 
@@ -18,4 +18,12 @@ define Target/Description
 	Build firmware images for Infineon Amazon boards
 endef
 
+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))