Commit 7ba0358c authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by David Mosberger

[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.)
parent cf6921d5
...@@ -322,13 +322,13 @@ setup_arch (char **cmdline_p) ...@@ -322,13 +322,13 @@ setup_arch (char **cmdline_p)
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI_BOOT
acpi_boot_init(); acpi_boot_init();
#endif #endif
#ifdef CONFIG_SERIAL_8250_CONSOLE
#ifdef CONFIG_SERIAL_8250_HCDP #ifdef CONFIG_SERIAL_8250_HCDP
if (efi.hcdp) { if (efi.hcdp) {
void setup_serial_hcdp(void *); void setup_serial_hcdp(void *);
setup_serial_hcdp(efi.hcdp); setup_serial_hcdp(efi.hcdp);
} }
#endif #endif
#ifdef CONFIG_SERIAL_8250_CONSOLE
/* /*
* Without HCDP, we won't discover any serial ports until the serial driver looks * 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 * in the ACPI namespace. If ACPI claims there are some legacy devices, register
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment