Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccb12654 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' into next 

* pci/misc:
  PCI: Update documentation 00-INDEX file
  PCI: Convert ioapic to be builtin only, not modular
parents 1ecf38c8 c2a5a829

Documentation/PCI/00-INDEX

+2 −2
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 
	- this file

MSI-HOWTO.txt

	- the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ.

PCI-DMA-mapping.txt

	- info for PCI drivers using DMA portably across all platforms

PCIEBUS-HOWTO.txt

	- a guide describing the PCI Express Port Bus driver

pci-error-recovery.txt

	- info on PCI error recovery

pci-iov-howto.txt

	- the PCI Express I/O Virtualization HOWTO

pci.txt

	- info on the PCI subsystem for device driver authors

pcieaer-howto.txt

drivers/pci/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -105,9 +105,10 @@ config PCI_PASID 
	  If unsure, say N.



config PCI_IOAPIC

	tristate "PCI IO-APIC hotplug support" if X86

	bool "PCI IO-APIC hotplug support" if X86

	depends on PCI

	depends on ACPI

	depends on X86_IO_APIC

	default !X86



config PCI_LABEL

drivers/pci/ioapic.c

+5 −1
Original line number Diff line number Diff line
@@ -113,6 +113,10 @@ static struct pci_driver ioapic_driver = { 
	.remove		= ioapic_remove,

};



module_pci_driver(ioapic_driver);

static int __init ioapic_init(void)

{

	return pci_register_driver(&ioapic_driver);

}

module_init(ioapic_init);



MODULE_LICENSE("GPL");