diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-08-13 15:59:06 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-08-13 15:59:06 +1000 |
| commit | b3124ec2f9970c7374d34b00843d9791fca66afc (patch) | |
| tree | ae23bfb84d1bf196f7270bc438472d5329aeee92 /arch/powerpc/Makefile | |
| parent | f7a6947cd49b7ff4e03f1b4f7e7b223003d752ca (diff) | |
| parent | cca19f0b684f4ed6aabf6ad07ae3e15e77bfd78a (diff) | |
| download | linux-rpi3-b3124ec2f9970c7374d34b00843d9791fca66afc.tar.gz linux-rpi3-b3124ec2f9970c7374d34b00843d9791fca66afc.tar.bz2 linux-rpi3-b3124ec2f9970c7374d34b00843d9791fca66afc.zip | |
Merge branch 'fixes' into next
Merge our fixes branch from the 4.18 cycle to resolve some minor
conflicts.
Diffstat (limited to 'arch/powerpc/Makefile')
| -rw-r--r-- | arch/powerpc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 828efa7c2a35..8397c7bd5880 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -237,6 +237,7 @@ endif cpu-as-$(CONFIG_4xx) += -Wa,-m405 cpu-as-$(CONFIG_ALTIVEC) += $(call as-option,-Wa$(comma)-maltivec) cpu-as-$(CONFIG_E200) += -Wa,-me200 +cpu-as-$(CONFIG_E500) += -Wa,-me500 cpu-as-$(CONFIG_PPC_BOOK3S_64) += -Wa,-mpower4 cpu-as-$(CONFIG_PPC_E500MC) += $(call as-option,-Wa$(comma)-me500mc) |