Merge branch 'pci/misc' into next

* pci/misc:
  PCI/ACPI: Notify PCI devices when their power resource is turned on
  PCI: Add GPL license for drivers/pci/ioapic module
  PCI: Fix bit definitions of PCI_EXP_LNKCAP2 register

2 files changed, 4 insertions, 0 deletions

diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
index 911144b22c89..a1dee29beed3 100644
--- a/drivers/acpi/pci_bind.c
+++ b/drivers/acpi/pci_bind.c
@@ -45,6 +45,7 @@ static int acpi_pci_unbind(struct acpi_device *device)
 
         device_set_run_wake(&dev->dev, false);
         pci_acpi_remove_pm_notifier(device);
+        acpi_power_resource_unregister_device(&dev->dev, device->handle);
 
         if (!dev->subordinate)
                 goto out;
@@ -71,6 +72,7 @@ static int acpi_pci_bind(struct acpi_device *device)
                 return 0;
 
         pci_acpi_add_pm_notifier(device, dev);
+        acpi_power_resource_register_device(&dev->dev, device->handle);
         if (device->wakeup.flags.run_wake)
                 device_set_run_wake(&dev->dev, true);
 
diff --git a/drivers/pci/ioapic.c b/drivers/pci/ioapic.c
index 205af8dc83c2..22436f74eb50 100644
--- a/drivers/pci/ioapic.c
+++ b/drivers/pci/ioapic.c
@@ -125,3 +125,5 @@ static void __exit ioapic_exit(void)
 
 module_init(ioapic_init);
 module_exit(ioapic_exit);
+
+MODULE_LICENSE("GPL");