]> err.no Git - linux-2.6/commit
[PATCH] powerpc: fix dynamic PCI probe regression
authorJohn Rose <johnrose@austin.ibm.com>
Fri, 24 Feb 2006 17:34:23 +0000 (11:34 -0600)
committerPaul Mackerras <paulus@samba.org>
Tue, 28 Feb 2006 05:25:54 +0000 (16:25 +1100)
commit827c1a6c1a5dcb2902fecfb648f9af6a532934eb
tree7cc96f3b3df746dc8569bc1b0bffd47f11084214
parenta8b76b491510b7591c584838d0d7922f9ffe5c2c
[PATCH] powerpc: fix dynamic PCI probe regression

Some hotplug driver functions were migrated to the kernel for use by EEH
in commit 2bf6a8fa21570f37fd1789610da30f70a05ac5e3.

Previously, the PCI Hotplug module had been changed to use the new
OFDT-based PCI probe when appropriate:
5fa80fcdca9d20d30c9ecec30d4dbff4ed93a5c6

When rpaphp_pci_config_slot() was moved from the rpaphp driver to the
new kernel function pcibios_add_pci_devices(), the OFDT-based probe
stuff was dropped.  This patch restores it.

Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/platforms/pseries/eeh.c
arch/powerpc/platforms/pseries/pci_dlpar.c
include/asm-powerpc/eeh.h