Merge branches 'amba', 'fixes', 'misc' and 'tauros2' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 4 Mar 2016 23:36:02 +0000 (23:36 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 4 Mar 2016 23:36:02 +0000 (23:36 +0000)
1  2  3  4  5 
arch/arm/boot/compressed/Makefile

@@@@@@ -176,11 -167,11 -176,11 -164,11 -167,9 +173,11 @@@@@@ if [ $(words $(ZRELADDR)) -gt 1 -a "$(C
        false; \
     fi
     
    -$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \
    +efi-obj-$(CONFIG_EFI_STUB) := $(objtree)/drivers/firmware/efi/libstub/lib.a
    +
---  $(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \
+++ +$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.o \
                $(addprefix $(obj)/, $(OBJS)) $(lib1funcs) $(ashldi3) \
    -           $(bswapsdi2) FORCE
    +           $(bswapsdi2) $(efi-obj-y) FORCE
        @$(check_for_multiple_zreladdr)
        $(call if_changed,ld)
        @$(check_for_bad_syms)