[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3

[linux-2.6] / drivers / acpi / pci_link.c

diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 834c2ceff1aa4ba1864e2dfff84667384a33a72a..26aa3829f1def0fe1d6dde66eac3bdd9cc645165 100644 (file)
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -804,8 +804,7 @@ acpi_pci_link_resume(
  */
 int acpi_in_resume;
 static int
-irqrouter_resume(
-       struct sys_device *dev)
+irqrouter_resume(struct sys_device *dev)
 {
        struct list_head        *node = NULL;
        struct acpi_pci_link    *link = NULL;