summaryrefslogtreecommitdiff
path: root/drivers/acpi/pci_link.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-01-09 03:37:48 -0500
committerLen Brown <len.brown@intel.com>2009-01-09 03:37:48 -0500
commitd0302bc62af7983040ea1cd1b5dd2b36e1a6a509 (patch)
treeef45618ae057e21fff7c82190939fe5f4466cf06 /drivers/acpi/pci_link.c
parent106ad8d6b0a7c1a597fab56ec692c39f553fabbc (diff)
parent237889bf0a62f1399fb2ba0c2a259e6a96597131 (diff)
Merge branch 'misc' into release
Conflicts: include/acpi/acpixf.h Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/pci_link.c')
-rw-r--r--drivers/acpi/pci_link.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 4869fa1b7892..1c6e73c7865e 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -796,10 +796,6 @@ static int irqrouter_resume(struct sys_device *dev)
struct list_head *node = NULL;
struct acpi_pci_link *link = NULL;
-
- /* Make sure SCI is enabled again (Apple firmware bug?) */
- acpi_set_register(ACPI_BITREG_SCI_ENABLE, 1);
-
list_for_each(node, &acpi_link.entries) {
link = list_entry(node, struct acpi_pci_link, node);
if (!link) {