diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-12 18:53:16 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-12 18:53:16 +0200 |
| commit | 0ba1c1950c320fcfdfe3dbc7470884e4a390083c (patch) | |
| tree | df52579dd94c0d895329193d9896cc02a92235ab /arch/nios2/kernel/Makefile | |
| parent | Merge tag 'docs-4.12-2' of git://git.lwn.net/linux (diff) | |
| parent | nios2: remove custom early console implementation (diff) | |
| download | linux-0ba1c1950c320fcfdfe3dbc7470884e4a390083c.tar.xz linux-0ba1c1950c320fcfdfe3dbc7470884e4a390083c.zip | |
Merge tag 'nios2-v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2
Pull nios2 updates from Ley Foon Tan:
"nios2 fixes/enhancements and adding nios2 R2 support"
* tag 'nios2-v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
nios2: remove custom early console implementation
nios2: use generic strncpy_from_user() and strnlen_user()
nios2: Add CDX support
nios2: Add BMX support
nios2: Add NIOS2_ARCH_REVISION to select between R1 and R2
nios2: implement flush_dcache_mmap_lock/unlock
nios2: enable earlycon support
nios2: constify irq_domain_ops
nios2: remove wrapper header for cmpxchg.h
nios2: add .gitignore entries for auto-generated files
Diffstat (limited to 'arch/nios2/kernel/Makefile')
| -rw-r--r-- | arch/nios2/kernel/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/nios2/kernel/Makefile b/arch/nios2/kernel/Makefile index 1aae25703657..06d07432b38d 100644 --- a/arch/nios2/kernel/Makefile +++ b/arch/nios2/kernel/Makefile @@ -20,7 +20,6 @@ obj-y += syscall_table.o obj-y += time.o obj-y += traps.o -obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_NIOS2_ALIGNMENT_TRAP) += misaligned.o |