From cd684240482930292eb8f1668200a3ad9500da0b Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 19 Jun 2006 18:05:09 -0700
Subject: [PATCH] --- yaml --- r: 27224 b: refs/heads/master c:
 5603509137940f4cbc577281cee62110d4097b1b h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/acpi/pci_link.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bd014973f38f..69f1165ba3a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1cca0ebbb74298958dae1d1d3e7e9287c98a720c
+refs/heads/master: 5603509137940f4cbc577281cee62110d4097b1b
diff --git a/trunk/drivers/acpi/pci_link.c b/trunk/drivers/acpi/pci_link.c
index 07bc6dfe662b..8920e8c6e246 100644
--- a/trunk/drivers/acpi/pci_link.c
+++ b/trunk/drivers/acpi/pci_link.c
@@ -812,6 +812,9 @@ static int irqrouter_resume(struct sys_device *dev)
 
 	ACPI_FUNCTION_TRACE("irqrouter_resume");
 
+	/* 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);