aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/Kconfig
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2014-03-26 16:40:25 -0400
committerRalf Baechle <ralf@linux-mips.org>2014-03-31 04:16:52 -0400
commite60865572f81fb2687163fd37ea37cd4283e0bce (patch)
tree529842a1923c998d3b2a70fa41f3b9bbdd6b2588 /arch/mips/Kconfig
parentb098d6726bbfb94c06d6e1097466187afddae61f (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')
-rw-r--r--arch/mips/Kconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 95fa1f1d5c8b..7111d74a01a0 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -123,7 +123,7 @@ config BCM47XX
123 select SYS_SUPPORTS_32BIT_KERNEL 123 select SYS_SUPPORTS_32BIT_KERNEL
124 select SYS_SUPPORTS_LITTLE_ENDIAN 124 select SYS_SUPPORTS_LITTLE_ENDIAN
125 select SYS_HAS_EARLY_PRINTK 125 select SYS_HAS_EARLY_PRINTK
126 select EARLY_PRINTK_8250 if EARLY_PRINTK 126 select USE_GENERIC_EARLY_PRINTK_8250
127 help 127 help
128 Support for BCM47XX based boards 128 Support for BCM47XX based boards
129 129
@@ -150,7 +150,6 @@ config MIPS_COBALT
150 select CSRC_R4K 150 select CSRC_R4K
151 select CEVT_GT641XX 151 select CEVT_GT641XX
152 select DMA_NONCOHERENT 152 select DMA_NONCOHERENT
153 select EARLY_PRINTK_8250 if EARLY_PRINTK
154 select HW_HAS_PCI 153 select HW_HAS_PCI
155 select I8253 154 select I8253
156 select I8259 155 select I8259
@@ -163,6 +162,7 @@ config MIPS_COBALT
163 select SYS_SUPPORTS_32BIT_KERNEL 162 select SYS_SUPPORTS_32BIT_KERNEL
164 select SYS_SUPPORTS_64BIT_KERNEL 163 select SYS_SUPPORTS_64BIT_KERNEL
165 select SYS_SUPPORTS_LITTLE_ENDIAN 164 select SYS_SUPPORTS_LITTLE_ENDIAN
165 select USE_GENERIC_EARLY_PRINTK_8250
166 166
167config MACH_DECSTATION 167config MACH_DECSTATION
168 bool "DECstations" 168 bool "DECstations"
@@ -674,6 +674,7 @@ config SNI_RM
674 select SYS_SUPPORTS_BIG_ENDIAN 674 select SYS_SUPPORTS_BIG_ENDIAN
675 select SYS_SUPPORTS_HIGHMEM 675 select SYS_SUPPORTS_HIGHMEM
676 select SYS_SUPPORTS_LITTLE_ENDIAN 676 select SYS_SUPPORTS_LITTLE_ENDIAN
677 select USE_GENERIC_EARLY_PRINTK_8250
677 help 678 help
678 The SNI RM200/300/400 are MIPS-based machines manufactured by 679 The SNI RM200/300/400 are MIPS-based machines manufactured by
679 Siemens Nixdorf Informationssysteme (SNI), parent company of Pyramid 680 Siemens Nixdorf Informationssysteme (SNI), parent company of Pyramid