diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-05-25 08:04:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-05-25 08:04:39 +0200 |
| commit | 0548dc5cde19e88b8495cb74e3893d8c8713392a (patch) | |
| tree | 69dd6c504d7ef286b0241e9f1a57bac60302810c /arch/mips/boot/compressed/uart-16550.c | |
| parent | bb4e30a48045c9cc16c4efe447489542750397cc (diff) | |
| parent | 4ff648decf4712d39f184fc2df3163f43975575a (diff) | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/boot/compressed/uart-16550.c')
| -rw-r--r-- | arch/mips/boot/compressed/uart-16550.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/boot/compressed/uart-16550.c b/arch/mips/boot/compressed/uart-16550.c index b3043c08f769..aee8d7b8f091 100644 --- a/arch/mips/boot/compressed/uart-16550.c +++ b/arch/mips/boot/compressed/uart-16550.c @@ -18,9 +18,9 @@ #define PORT(offset) (CKSEG1ADDR(AR7_REGS_UART0) + (4 * offset)) #endif -#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)) +#ifdef CONFIG_MACH_INGENIC +#define INGENIC_UART0_BASE_ADDR 0x10030000 +#define PORT(offset) (CKSEG1ADDR(INGENIC_UART0_BASE_ADDR) + (4 * offset)) #endif #ifdef CONFIG_CPU_XLR |