Merge ../to-linus

1 files changed, 11 insertions, 0 deletions

diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 6a29610edc11..0091dbdf7ef9 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -692,7 +692,18 @@ acpi_pci_link_free_irq(acpi_handle handle)
                 return_VALUE(-1);
         }
 
+#ifdef  FUTURE_USE
+        /*
+         * The Link reference count allows us to _DISable an unused link
+         * and suspend time, and set it again  on resume.
+         * However, 2.6.12 still has irq_router.resume
+         * which blindly restores the link state.
+         * So we disable the reference count method
+         * to prevent duplicate acpi_pci_link_set()
+         * which would harm some systems
+         */
         link->refcnt --;
+#endif
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                 "Link %s is dereferenced\n", acpi_device_bid(link->device)));