On Fri, Dec 19, 2008 at 12:22 AM, Len Brown <lenb@xxxxxxxxxx> wrote: > From: Len Brown <len.brown@xxxxxxxxx> > > We start the system off with disabled links. > Here we enable the reference counting > on the links so that when drivers free IRQs > the links can return to the disabled state. > > Drivers free their IRQ and reference on a link > when they unload. They may also do so upon > suspend. However, if they don't, irqrouter_resume() > will still resume any links that were > not disabled before suspend. > > Signed-off-by: Len Brown <len.brown@xxxxxxxxx> > --- > drivers/acpi/pci_link.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c > index 595b131..7d12762 100644 > --- a/drivers/acpi/pci_link.c > +++ b/drivers/acpi/pci_link.c > @@ -693,6 +693,7 @@ int acpi_pci_link_free_irq(acpi_handle handle) > printk(KERN_ERR PREFIX "Link isn't initialized\n"); > return -1; > } > +<<<<<<< HEAD:drivers/acpi/pci_link.c > #ifdef FUTURE_USE > /* > * The Link reference count allows us to _DISable an unused link > @@ -703,8 +704,9 @@ int acpi_pci_link_free_irq(acpi_handle handle) > * to prevent duplicate acpi_pci_link_set() > * which would harm some systems > */ > +======= > +>>>>>>> 683984a... ACPI: PCI Interrupt Links -- disable when unused:drivers/acpi/pci_link.c > link->refcnt--; > -#endif looks like merge conflicts fix. YH -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
