summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-11-13 14:34:06 -0700
committerBjorn Helgaas <bhelgaas@google.com>2012-11-13 14:34:06 -0700
commit7db78a9c864d1baf916d849febef31e274cfcb1f (patch)
treeebbe90db1637aec1f1027dfa9436b0f5ede9453e /drivers/pci
parentf9c15b429a5c82e613d59a32d4f49cea6e9d64eb (diff)
parent71fbad6c9a28629b6af40b0ff48f36c6610a1394 (diff)
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
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/ioapic.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/ioapic.c b/drivers/pci/ioapic.c
index 205af8dc83c..22436f74eb5 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");