diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2014-03-26 16:40:25 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-03-31 04:16:52 -0400 |
commit | e60865572f81fb2687163fd37ea37cd4283e0bce (patch) | |
tree | 529842a1923c998d3b2a70fa41f3b9bbdd6b2588 /arch/mips/Kconfig.debug | |
parent | b098d6726bbfb94c06d6e1097466187afddae61f (diff) |
MIPS: Fix build error due to multiple prom_putchar() definitions.
This can happen if both the generic 8250 and another early console
driver are enable. Fixed by using an auxilliary kconfig symbol to
restrict that choice.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/Kconfig.debug')
-rw-r--r-- | arch/mips/Kconfig.debug | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug index b147e7038ff0..25de29211d76 100644 --- a/arch/mips/Kconfig.debug +++ b/arch/mips/Kconfig.debug | |||
@@ -21,13 +21,17 @@ config EARLY_PRINTK | |||
21 | unless you want to debug such a crash. | 21 | unless you want to debug such a crash. |
22 | 22 | ||
23 | config EARLY_PRINTK_8250 | 23 | config EARLY_PRINTK_8250 |
24 | bool "8250/16550 and compatible serial early printk driver" | 24 | bool |
25 | depends on EARLY_PRINTK | 25 | depends on EARLY_PRINTK && USE_GENERIC_EARLY_PRINTK_8250 |
26 | default n | 26 | default y |
27 | help | 27 | help |
28 | "8250/16550 and compatible serial early printk driver" | ||
28 | If you say Y here, it will be possible to use a 8250/16550 serial | 29 | If you say Y here, it will be possible to use a 8250/16550 serial |
29 | port as the boot console. | 30 | port as the boot console. |
30 | 31 | ||
32 | config USE_GENERIC_EARLY_PRINTK_8250 | ||
33 | bool | ||
34 | |||
31 | config CMDLINE_BOOL | 35 | config CMDLINE_BOOL |
32 | bool "Built-in kernel command line" | 36 | bool "Built-in kernel command line" |
33 | default n | 37 | default n |