Add an MTX-1 specific patch to avoid functions redefinition at compile-time.

[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 bfdc075..330ed93 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
+LINUX_VERSION:=2.6.16.2

 LINUX_RELEASE:=1
 LINUX_RELEASE:=1

-LINUX_KERNEL_MD5SUM:=cdf95e00f5111e31f78e1d97304d9522
+LINUX_KERNEL_MD5SUM:=d4105a5ba1d9f82acee2c525c65ef969

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


@@ -14,12 +14,12 @@ include ../kernel.mk
 $(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)
 $(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)

-       @cp config $(LINUX_DIR)/.config
+       @$(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)
        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)

-       cp -f $(LINUX_DIR)/arch/i386/boot/bzImage $@
+       $(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $@

        touch $@
 
 compile: $(LINUX_BUILD_DIR)/bzImage
        touch $@
 
 compile: $(LINUX_BUILD_DIR)/bzImage