Commit fe783356 authored by Paul Jackson's avatar Paul Jackson Committed by Linus Torvalds

[PATCH] Fix ia64 UPF_RESOURCES pcdp.c 2.6.7-mm5 build

It looks like someone removed UPF_RESOURCES in remove-upf_resources.patch
in parallel with someone adding drivers/firmware/pcdp.c that references
UPF_RESOURCES.

In any event, trying to build a defconfig ia64 2.6.7-mm5 (which includes
CONFIG_SERIAL_8250=y in the .config) fails with:

drivers/firmware/pcdp.c: In function `setup_serial_console':
drivers/firmware/pcdp.c:100: error: `UPF_RESOURCES' undeclared (first use in this function)
Signed-off-by: default avatarPaul Jackson <pj@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e597b538
...@@ -90,7 +90,7 @@ setup_serial_console(int rev, struct pcdp_uart *uart) ...@@ -90,7 +90,7 @@ setup_serial_console(int rev, struct pcdp_uart *uart)
default: port.type = PORT_UNKNOWN; break; default: port.type = PORT_UNKNOWN; break;
} }
port.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF | UPF_RESOURCES; port.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;
if (uart_irq_supported(rev, uart)) { if (uart_irq_supported(rev, uart)) {
port.irq = acpi_register_gsi(uart->gsi, port.irq = acpi_register_gsi(uart->gsi,
......
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