resync with kamikaze

[openwrt.git] / target / linux / x86-2.6 / Makefile

diff --git a/target/linux/x86-2.6/Makefile b/target/linux/x86-2.6/Makefile
index 45a2e1c..2a9ab2c 100644 (file)
--- a/target/linux/x86-2.6/Makefile
+++ b/target/linux/x86-2.6/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 include $(TOPDIR)/rules.mk
 

-LINUX_VERSION:=2.6.15.1
+LINUX_VERSION:=2.6.16.7

 LINUX_RELEASE:=1
 LINUX_RELEASE:=1

-LINUX_KERNEL_MD5SUM:=3a71f70fecf25a893bb95efaa37f575c
+LINUX_KERNEL_MD5SUM:=9682b2bd6e02f3087982d7c3f5ba824e

 
 include ../rules.mk
 include ./config
 
 include ../rules.mk
 include ./config


@@ -12,13 +12,13 @@ include ../kernel.mk
 
 
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
 
 
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked

-       [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE)
-       [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE)
+       [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches
+       [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches

        @$(CP) config $(LINUX_DIR)/.config
        touch $@
 
 $(LINUX_BUILD_DIR)/bzImage: $(LINUX_DIR)/vmlinux
        @$(CP) config $(LINUX_DIR)/.config
        touch $@
 
 $(LINUX_BUILD_DIR)/bzImage: $(LINUX_DIR)/vmlinux

-       $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) bzImage $(MAKE_TRACE)
+       $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) bzImage

        $(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $@
        touch $@
 
        $(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $@
        touch $@