Merge branch 'pci/misc' into next
* pci/misc: PCI: Update documentation 00-INDEX file PCI: Convert ioapic to be builtin only, not modularhifive-unleashed-5.1
commit
ccb1265454
|
@ -2,12 +2,12 @@
|
||||||
- this file
|
- this file
|
||||||
MSI-HOWTO.txt
|
MSI-HOWTO.txt
|
||||||
- the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ.
|
- 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
|
PCIEBUS-HOWTO.txt
|
||||||
- a guide describing the PCI Express Port Bus driver
|
- a guide describing the PCI Express Port Bus driver
|
||||||
pci-error-recovery.txt
|
pci-error-recovery.txt
|
||||||
- info on PCI error recovery
|
- info on PCI error recovery
|
||||||
|
pci-iov-howto.txt
|
||||||
|
- the PCI Express I/O Virtualization HOWTO
|
||||||
pci.txt
|
pci.txt
|
||||||
- info on the PCI subsystem for device driver authors
|
- info on the PCI subsystem for device driver authors
|
||||||
pcieaer-howto.txt
|
pcieaer-howto.txt
|
||||||
|
|
|
@ -105,9 +105,10 @@ config PCI_PASID
|
||||||
If unsure, say N.
|
If unsure, say N.
|
||||||
|
|
||||||
config PCI_IOAPIC
|
config PCI_IOAPIC
|
||||||
tristate "PCI IO-APIC hotplug support" if X86
|
bool "PCI IO-APIC hotplug support" if X86
|
||||||
depends on PCI
|
depends on PCI
|
||||||
depends on ACPI
|
depends on ACPI
|
||||||
|
depends on X86_IO_APIC
|
||||||
default !X86
|
default !X86
|
||||||
|
|
||||||
config PCI_LABEL
|
config PCI_LABEL
|
||||||
|
|
|
@ -113,6 +113,10 @@ static struct pci_driver ioapic_driver = {
|
||||||
.remove = ioapic_remove,
|
.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");
|
MODULE_LICENSE("GPL");
|
||||||
|
|
Loading…
Reference in New Issue