ARM: ixp4xx: include irqs.h where needed

[thirdparty/kernel/linux.git] / Makefile

diff --git a/Makefile b/Makefile
index 004d67a4405f3640e7d8c54884a555e7a71c89a3..9514dac2660a914dcaf5d0c7f6c10140c7a23df9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 VERSION = 5
 PATCHLEVEL = 2
 SUBLEVEL = 0
-EXTRAVERSION = -rc3
+EXTRAVERSION = -rc5
 NAME = Golden Lions
 
 # *DOCUMENTATION*
@@ -1228,9 +1228,8 @@ kselftest-clean:
 PHONY += kselftest-merge
 kselftest-merge:
        $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!))
-       $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
-               -m $(objtree)/.config \
-               $(srctree)/tools/testing/selftests/*/config
+       $(Q)find $(srctree)/tools/testing/selftests -name config | \
+               xargs $(srctree)/scripts/kconfig/merge_config.sh -m $(objtree)/.config
        +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
 
 # ---------------------------------------------------------------------------