Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (27 commits) x86: allocate space within a region top-down x86: update iomem_resource end based on CPU physical address capabilities x86/PCI: allocate space from the end of a region, not the beginning PCI: allocate bus resources from the top down resources: support allocating space within a region from the top down resources: handle overflow when aligning start of available area resources: ensure callback doesn't allocate outside available space resources: factor out resource_clip() to simplify find_resource() resources: add a default alignf to simplify find_resource() x86/PCI: MMCONFIG: fix region end calculation PCI: Add support for polling PME state on suspended legacy PCI devices PCI: Export some PCI PM functionality PCI: fix message typo PCI: log vendor/device ID always PCI: update Intel chipset names and defines PCI: use new ccflags variable in Makefile PCI: add PCI_MSIX_TABLE/PBA defines PCI: add PCI vendor id for STmicroelectronics x86/PCI: irq and pci_ids patch for Intel Patsburg DeviceIDs PCI: OLPC: Only enable PCI configuration type override on XO-1 ...
Showing
- Documentation/kernel-parameters.txt 5 additions, 0 deletionsDocumentation/kernel-parameters.txt
- arch/x86/kernel/setup.c 2 additions, 0 deletionsarch/x86/kernel/setup.c
- arch/x86/pci/i386.c 11 additions, 6 deletionsarch/x86/pci/i386.c
- arch/x86/pci/irq.c 6 additions, 5 deletionsarch/x86/pci/irq.c
- arch/x86/pci/mmconfig-shared.c 1 addition, 3 deletionsarch/x86/pci/mmconfig-shared.c
- drivers/i2c/busses/Kconfig 2 additions, 2 deletionsdrivers/i2c/busses/Kconfig
- drivers/i2c/busses/i2c-i801.c 5 additions, 5 deletionsdrivers/i2c/busses/i2c-i801.c
- drivers/pci/Makefile 1 addition, 3 deletionsdrivers/pci/Makefile
- drivers/pci/bus.c 48 additions, 5 deletionsdrivers/pci/bus.c
- drivers/pci/hotplug/ibmphp_hpc.c 2 additions, 2 deletionsdrivers/pci/hotplug/ibmphp_hpc.c
- drivers/pci/msi.h 2 additions, 2 deletionsdrivers/pci/msi.h
- drivers/pci/pci.c 78 additions, 1 deletiondrivers/pci/pci.c
- drivers/pci/pci.h 0 additions, 3 deletionsdrivers/pci/pci.h
- drivers/pci/pcie/aer/aerdrv.c 1 addition, 1 deletiondrivers/pci/pcie/aer/aerdrv.c
- drivers/pci/pcie/aer/aerdrv.h 3 additions, 0 deletionsdrivers/pci/pcie/aer/aerdrv.h
- drivers/pci/pcie/aer/aerdrv_acpi.c 34 additions, 0 deletionsdrivers/pci/pcie/aer/aerdrv_acpi.c
- drivers/pci/pcie/aer/aerdrv_core.c 1 addition, 1 deletiondrivers/pci/pcie/aer/aerdrv_core.c
- drivers/pci/pcie/portdrv_acpi.c 1 addition, 1 deletiondrivers/pci/pcie/portdrv_acpi.c
- drivers/pci/probe.c 2 additions, 2 deletionsdrivers/pci/probe.c
- drivers/pci/proc.c 1 addition, 0 deletionsdrivers/pci/proc.c
Loading
Please register or sign in to comment