[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3
Len Brown [Fri, 5 Aug 2005 04:31:42 +0000 (00:31 -0400)]
Signed-off-by: Len Brown <len.brown@intel.com>

1  2 
arch/i386/kernel/acpi/boot.c
arch/ia64/kernel/acpi.c
arch/ia64/kernel/iosapic.c
drivers/acpi/Kconfig
drivers/acpi/pci_irq.c
drivers/acpi/pci_link.c
drivers/char/hpet.c
include/linux/acpi.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -786,26 -786,7 +786,25 @@@ end
        return_VALUE(result);
  }
  
 -static int irqrouter_suspend(struct sys_device *dev, pm_message_t state)
 +static int
 +acpi_pci_link_resume(
 +      struct acpi_pci_link *link)
 +{
 +      ACPI_FUNCTION_TRACE("acpi_pci_link_resume");
 +
 +      if (link->refcnt && link->irq.active && link->irq.initialized)
 +              return_VALUE(acpi_pci_link_set(link, link->irq.active));
 +      else
 +              return_VALUE(0);
 +}
 +
 +/*
 + * FIXME: this is a workaround to avoid nasty warning.  It will be removed
 + * after every device calls pci_disable_device in .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;
Simple merge
Simple merge