diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 13:16:33 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 13:16:33 +0200 |
| commit | 472475000979a156bc32cd75caa59737f5a1caa5 (patch) | |
| tree | 6a98319244f7954237cf866c8862ffe3f6128d2d /scripts/Makefile.lib | |
| parent | 712fca63f50a87780ca6dc105370557a945a7ee8 (diff) | |
| parent | 9d7b18668956c411a422d04c712994c5fdb23a4b (diff) | |
Merge branch 'for-4.20/apple' into for-linus
Support for Apple Magic Trackpad 2
Diffstat (limited to 'scripts/Makefile.lib')
| -rw-r--r-- | scripts/Makefile.lib | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index df0fff252619..61e596650ed3 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -162,7 +162,7 @@ a_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ $(__cpp_flags) -ld_flags = $(LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) +ld_flags = $(KBUILD_LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) DTC_INCLUDE := $(srctree)/scripts/dtc/include-prefixes |