From 7ba0358c14c5d0264140c29120f215823216def0 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Tue, 13 Jan 2004 19:18:29 -0800 Subject: [PATCH] [PATCH] ia64: move HCDP under serial console #ifdef Currently you can select HCDP independent of serial console. This doesn't seem very useful, and makes the setup_serial_hcdp() reference unresolved if the serial driver is built as a module. CONFIG_SERIAL_8250_CONSOLE is only selectable if the serial core is built in (SERIAL_8250=y), so this patch makes sure we don't try to call setup_serial_hcdp() unless it is actually built in to the kernel. (I think we should also make HCDP selection dependent on SERIAL_8250_CONSOLE=y in Kconfig; I'll send a separate patch for that since it's not ia64-specific.) --- arch/ia64/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 3843222b2102c..d95c23bd9ef1f 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -322,13 +322,13 @@ setup_arch (char **cmdline_p) #ifdef CONFIG_ACPI_BOOT acpi_boot_init(); #endif +#ifdef CONFIG_SERIAL_8250_CONSOLE #ifdef CONFIG_SERIAL_8250_HCDP if (efi.hcdp) { void setup_serial_hcdp(void *); setup_serial_hcdp(efi.hcdp); } #endif -#ifdef CONFIG_SERIAL_8250_CONSOLE /* * Without HCDP, we won't discover any serial ports until the serial driver looks * in the ACPI namespace. If ACPI claims there are some legacy devices, register -- 2.53.0