diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-16 14:07:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-16 14:07:39 -0700 |
| commit | a27fc14219f2e3c4a46ba9177b04d9b52c875532 (patch) | |
| tree | c11ca3db94e2861b70cfbc01342e7cb048c62f44 /arch | |
| parent | d95c8844399885cd511c6f6395621cc1a9fe2e68 (diff) | |
| parent | c7cd882469fc5042a5c84122b4062d7f53076db7 (diff) | |
| download | linux-a27fc14219f2e3c4a46ba9177b04d9b52c875532.tar.bz2 | |
Merge branch 'parisc-4.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc build fix from Helge Deller:
"Fix build error because of missing binfmt_elf32.o file which is still
mentioned in the Makefile"
* 'parisc-4.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Fix missing binfmt_elf32.o build error
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/parisc/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/Makefile b/arch/parisc/kernel/Makefile index eafd06ab59ef..e5de34d00b1a 100644 --- a/arch/parisc/kernel/Makefile +++ b/arch/parisc/kernel/Makefile @@ -23,7 +23,7 @@ obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_PA11) += pci-dma.o obj-$(CONFIG_PCI) += pci.o obj-$(CONFIG_MODULES) += module.o -obj-$(CONFIG_64BIT) += binfmt_elf32.o sys_parisc32.o signal32.o +obj-$(CONFIG_64BIT) += sys_parisc32.o signal32.o obj-$(CONFIG_STACKTRACE)+= stacktrace.o obj-$(CONFIG_AUDIT) += audit.o obj64-$(CONFIG_AUDIT) += compat_audit.o |