diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-13 13:04:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-13 13:04:46 -0700 |
| commit | a26555498849489fb87139a15abe2eeb8a366ae7 (patch) | |
| tree | b68ca8f813e92e6b405f0a4fb81d3545835a39ae /arch/mips/boot/compressed/uart-16550.c | |
| parent | f414ca64be4b36c30deb5b5fa25c5a8ff42ea56b (diff) | |
| parent | d825c06bfe8b885b797f917ad47365d0e9c21fbb (diff) | |
| download | lwn-a26555498849489fb87139a15abe2eeb8a366ae7.tar.gz lwn-a26555498849489fb87139a15abe2eeb8a366ae7.zip | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"Another round of MIPS fixes for 4.5:
- Fix JZ4780 build with DEBUG_ZBOOT and MACH_JZ4780
- Fix build with DEBUG_ZBOOT and MACH_JZ4780
- Fix issue with uninitialised temp_foreign_map
- Fix awk regex compile failure with certain versions of awk. At
this time, the sole user, ld-ifversion, is only used on MIPS"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: smp.c: Fix uninitialised temp_foreign_map
MIPS: Fix build error when SMP is used without GIC
ld-version: Fix awk regex compile failure
MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4780
Diffstat (limited to 'arch/mips/boot/compressed/uart-16550.c')
| -rw-r--r-- | arch/mips/boot/compressed/uart-16550.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/boot/compressed/uart-16550.c b/arch/mips/boot/compressed/uart-16550.c index 408799a839b4..f7521142deda 100644 --- a/arch/mips/boot/compressed/uart-16550.c +++ b/arch/mips/boot/compressed/uart-16550.c @@ -17,7 +17,7 @@ #define PORT(offset) (CKSEG1ADDR(AR7_REGS_UART0) + (4 * offset)) #endif -#ifdef CONFIG_MACH_JZ4740 +#if defined(CONFIG_MACH_JZ4740) || defined(CONFIG_MACH_JZ4780) #include <asm/mach-jz4740/base.h> #define PORT(offset) (CKSEG1ADDR(JZ4740_UART0_BASE_ADDR) + (4 * offset)) #endif |