X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fkernel-defaults.mk;h=24d26308b129b5202afa6bca61fbd3806ea6d916;hb=ac5a5acf9c8832f3ea0523e143cf7fcbf9eb85bc;hp=d6c892462359b551a0c2f623f2a731658d766a69;hpb=121fe0742152e1df0e3863f5b9fc67c7c893872a;p=openwrt.git

diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index d6c8924623..24d26308b1 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -107,8 +107,7 @@ define Kernel/Configure/Default
 	echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target
 	echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target
 	echo "# CONFIG_KALLSYMS_UNCOMPRESSED is not set" >> $(LINUX_DIR)/.config.target
-	echo "# CONFIG_KPROBES is not set" >> $(LINUX_DIR)/.config.target
-	$(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config > $(LINUX_DIR)/.config.override
+	$(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config $(KERNEL_PATCHVER) > $(LINUX_DIR)/.config.override
 	$(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config
 	$(call Kernel/SetNoInitramfs)
 	rm -rf $(KERNEL_BUILD_DIR)/modules
@@ -127,11 +126,6 @@ endef
 
 OBJCOPY_STRIP = -R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
 
-# AVR32 uses a non-standard location
-ifeq ($(LINUX_KARCH),avr32)
-IMAGES_DIR:=images
-endif
-
 # AMD64 shares the location with x86
 ifeq ($(LINUX_KARCH),x86_64)
 IMAGES_DIR:=../../x86/boot