X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=toolchain%2Fkernel-headers%2FMakefile;h=7a12f62d588d58f06b368ad466f3d991819b5671;hp=011ec959c866081ebcf2ce2c3ef93eaccbf473e5;hb=5f258e330da772ed4551670d4ba6f4b423f8a349;hpb=da932d9e1a0fba6eb16779764f66b04c53ef133d

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 011ec959c8..7a12f62d58 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -14,7 +14,6 @@ BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
 override QUILT:=
 
 include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/kernel-version.mk
 
 PKG_NAME:=linux
 PKG_VERSION:=$(LINUX_VERSION)
@@ -30,8 +29,8 @@ include $(INCLUDE_DIR)/kernel-defaults.mk
 define Build/Prepare/cris
 	mkdir -p $(BUILD_DIR_TOOLCHAIN)
 	bzcat $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(BUILD_DIR_TOOLCHAIN) $(TAR_OPTIONS)
-	$(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax-2.6/patches/generic_2.6
-	$(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax-2.6/patches/cris
+	$(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax/patches/generic_2.6
+	$(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax/patches/cris
 	ln -sf arch-v10 $(PKG_BUILD_DIR)/include/asm-cris/arch
 	ln -sf arch-v10 $(PKG_BUILD_DIR)/arch/cris/arch
 endef
@@ -39,7 +38,7 @@ endef
 define Build/Configure/powerpc
 	$(CP) $(PKG_BUILD_DIR)/include/asm-ppc/* $(PKG_BUILD_DIR)/include/asm-powerpc/
 	rm -rf $(PKG_BUILD_DIR)/include/asm-ppc
-	mv $(PKG_BUILD_DIR)/include/asm-powerpc $(PKG_BUILD_DIR)/include/asm-ppc
+	ln -s $(PKG_BUILD_DIR)/include/asm-powerpc $(PKG_BUILD_DIR)/include/asm-ppc
 endef
 
 ifneq (,$(findstring uml,$(BOARD)))
@@ -48,6 +47,7 @@ endif
 
 KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
 	ARCH=$(LINUX_KARCH) \
+	KBUILD_HAVE_NLS=no \
 	CONFIG_SHELL=$(BASH)
 
 define Build/Prepare