diff options
author | Len Brown <len.brown@intel.com> | 2006-07-10 02:39:47 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-07-10 02:39:47 -0400 |
commit | c0dc250e89cb8af77c5689b36eda851158e8573e (patch) | |
tree | 41c11fb811b31ee28bd20befdc685384f96db1fc /drivers/acpi/pci_link.c | |
parent | 0f12b15ebcedce115a5d8e5ff741e49a7993f67c (diff) | |
parent | e21c1ca3f98529921c829a792dfdbfc5a5dc393b (diff) |
Pull acpi_os_allocate into test branch
Diffstat (limited to 'drivers/acpi/pci_link.c')
-rw-r--r-- | drivers/acpi/pci_link.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 8197c0e4076..7f3e7e77e79 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c @@ -780,11 +780,6 @@ static int acpi_pci_link_resume(struct acpi_pci_link *link) return 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) { struct list_head *node = NULL; @@ -794,7 +789,6 @@ static int irqrouter_resume(struct sys_device *dev) /* Make sure SCI is enabled again (Apple firmware bug?) */ acpi_set_register(ACPI_BITREG_SCI_ENABLE, 1, ACPI_MTX_DO_NOT_LOCK); - acpi_in_resume = 1; list_for_each(node, &acpi_link.entries) { link = list_entry(node, struct acpi_pci_link, node); if (!link) { @@ -803,7 +797,6 @@ static int irqrouter_resume(struct sys_device *dev) } acpi_pci_link_resume(link); } - acpi_in_resume = 0; return 0; } |