The following commit has been merged in the linux branch: commit 2caa731819a633bec5a56736e64c562b7e193666 Merge: 589bf8d52b5bbb580962438ad9403ec6853bc12b 30fc24b5cbc55f9e6c686e2710cc812419bddc0c Author: Linus Torvalds torvalds@linux-foundation.org Date: Mon Oct 12 14:38:34 2009 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI: Prevent AER driver from being loaded on non-root port PCIE devices PCI: get larger bridge ranges when space is available PCI: pci.c: fix kernel-doc notation PCI quirk: TI XIO200a erroneously reports support for fast b2b transfers PCI PM: Read device power state from register after updating it PCI: remove pci_assign_resource_fixed() PCI: PCIe portdrv: remove "-driver" from driver name

diff --combined drivers/pci/pcie/aer/aerdrv.c index d49ecc9,6bf5b15..40c3cc5 --- a/drivers/pci/pcie/aer/aerdrv.c +++ b/drivers/pci/pcie/aer/aerdrv.c @@@ -17,7 -17,6 +17,7 @@@

#include <linux/module.h> #include <linux/pci.h> +#include <linux/sched.h> #include <linux/kernel.h> #include <linux/errno.h> #include <linux/pm.h> @@@ -53,7 -52,7 +53,7 @@@ static struct pci_error_handlers aer_er

static struct pcie_port_service_driver aerdriver = { .name = "aer", - .port_type = PCIE_ANY_PORT, + .port_type = PCIE_RC_PORT, .service = PCIE_PORT_SERVICE_AER,

.probe = aer_probe,