diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-03-19 16:59:34 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-03-19 17:00:01 +0100 |
| commit | 4654eba8cbb3fcf48c6fc24fbaffa0623d9faea2 (patch) | |
| tree | 0b3056c04bda1988a3705f315680224387d5a68b /arch/mips/boot/Makefile | |
| parent | 09b9ddfaa18317f463085d602cf5f60a5fa88665 (diff) | |
| parent | a6618f4aedb2b60932d766bd82ae7ce866e842aa (diff) | |
Merge branch 'for-linus' into for-next
Back-merge of for-linus branch for applying the further UAC3 patches.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'arch/mips/boot/Makefile')
| -rw-r--r-- | arch/mips/boot/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile index 1bd5c4f00d19..c22da16d67b8 100644 --- a/arch/mips/boot/Makefile +++ b/arch/mips/boot/Makefile @@ -126,6 +126,7 @@ $(obj)/vmlinux.its.S: $(addprefix $(srctree)/arch/mips/$(PLATFORM)/,$(ITS_INPUTS quiet_cmd_cpp_its_S = ITS $@ cmd_cpp_its_S = $(CPP) $(cpp_flags) -P -C -o $@ $< \ + -D__ASSEMBLY__ \ -DKERNEL_NAME="\"Linux $(KERNELRELEASE)\"" \ -DVMLINUX_BINARY="\"$(3)\"" \ -DVMLINUX_COMPRESSION="\"$(2)\"" \ |