Merge branch 'misc' into release

Conflicts:
	include/acpi/acpixf.h

Signed-off-by: Len Brown <len.brown@intel.com>

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) {