summaryrefslogtreecommitdiff
path: root/scripts/Kbuild.include
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2018-07-20 00:11:52 +0300
committerThomas Gleixner <tglx@linutronix.de>2018-07-20 00:11:52 +0300
commit73ab603f44149ff48889d5109ea9ab64bf38cc69 (patch)
tree9550d8fb31ddf6dffedf1f602ed44769e529c1d3 /scripts/Kbuild.include
parent41afb1dfad4d6af0c716746f6a15f3230482955c (diff)
parentfb7d1bcf1602b46f37ada72178516c01a250e434 (diff)
downloadlinux-73ab603f44149ff48889d5109ea9ab64bf38cc69.tar.xz
Merge branch 'linus' into x86/timers
Pick up upstream changes to avoid conflicts
Diffstat (limited to 'scripts/Kbuild.include')
-rw-r--r--scripts/Kbuild.include2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index c8156d61678c..86321f06461e 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -214,7 +214,7 @@ hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj
# Prefix -I with $(srctree) if it is not an absolute path.
# skip if -I has no parameter
addtree = $(if $(patsubst -I%,%,$(1)), \
-$(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)))
+$(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)),$(1))
# Find all -I options and call addtree
flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))