diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 11:09:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 11:09:15 -0400 |
| commit | ff0972c26bbf209da6f6d244cce60e695df863f6 (patch) | |
| tree | 79db41583bf3847139ace7a6d1eff0266ea63bc2 /drivers/pci/pcie/Kconfig | |
| parent | a09fc446fb6d541281d9559fe7215d7c0d3cc9ce (diff) | |
| parent | c9d86d76c1cdd76d67292ab75643db66573ca7dd (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (28 commits)
pciehp - fix wrong return value
IA64: PCI: dont disable irq which is not enabled
acpiphp: add support for ioapic hot-remove
PCI: assign ioapic resource at hotplug
acpiphp: disable bridges
acpiphp: stop bus device before acpi_bus_trim
PCI: add pci_stop_bus_device
acpiphp: do not initialize existing ioapics
acpiphp: initialize ioapics before starting devices
acpiphp: set hpp values before starting devices
PCI Hotplug: cleanup pcihp skeleton code.
PCI: Restore PCI Express capability registers after PM event
PCI: drivers/pci/hotplug/acpiphp_glue.c: make a function static
PCI: Multiprobe sanitizer
PCI: fix __must_check warnings
PCI Hotplug: fix __must_check warnings
SHPCHP: fix __must_check warnings
PCI-Express AER implemetation: pcie_portdrv error handler
PCI-Express AER implemetation: AER core and aerdriver
PCI-Express AER implemetation: export pcie_port_bus_type
...
Diffstat (limited to 'drivers/pci/pcie/Kconfig')
| -rw-r--r-- | drivers/pci/pcie/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig index 1012db8b8b2c..0ad92a8ad8b1 100644 --- a/drivers/pci/pcie/Kconfig +++ b/drivers/pci/pcie/Kconfig | |||
| @@ -34,3 +34,4 @@ config HOTPLUG_PCI_PCIE_POLL_EVENT_MODE | |||
| 34 | 34 | ||
| 35 | When in doubt, say N. | 35 | When in doubt, say N. |
| 36 | 36 | ||
| 37 | source "drivers/pci/pcie/aer/Kconfig" | ||