Commit b7d8e73f authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Russell King

[SERIAL] fix PCI interrupt setting for ia64

Patch from Bjorn Helgaas

ACPI and HCDP tell us what IRQ the serial port uses, so there's
no need to have the driver probe for the IRQ.
parent c03fdc67
...@@ -134,8 +134,7 @@ static int acpi_serial_add(struct acpi_device *device) ...@@ -134,8 +134,7 @@ static int acpi_serial_add(struct acpi_device *device)
} }
serial_req.baud_base = BASE_BAUD; serial_req.baud_base = BASE_BAUD;
serial_req.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF | serial_req.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF | UPF_RESOURCES;
UPF_AUTO_IRQ | UPF_RESOURCES;
priv->line = register_serial(&serial_req); priv->line = register_serial(&serial_req);
if (priv->line < 0) { if (priv->line < 0) {
......
...@@ -186,8 +186,6 @@ setup_serial_hcdp(void *tablep) ...@@ -186,8 +186,6 @@ setup_serial_hcdp(void *tablep)
port.irq = gsi; port.irq = gsi;
#endif #endif
port.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF | UPF_RESOURCES; port.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF | UPF_RESOURCES;
if (gsi)
port.flags |= ASYNC_AUTO_IRQ;
/* /*
* Note: the above memset() initializes port.line to 0, * Note: the above memset() initializes port.line to 0,
......
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