diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 15:18:16 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 15:18:16 -0500 |
| commit | 11bd04f6f35621193311c32e0721142b073a7794 (patch) | |
| tree | 00979740582bb26e8d3756bf3526c85f19f66a46 /drivers/xen/cpu_hotplug.c | |
| parent | 4e2ccdb0409146f8cf64a11b6ef82a9c928ced2a (diff) | |
| parent | 9e0b5b2c447ad0caa075a5cfef86def62e1782ff (diff) | |
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: (109 commits)
PCI: fix coding style issue in pci_save_state()
PCI: add pci_request_acs
PCI: fix BUG_ON triggered by logical PCIe root port removal
PCI: remove ifdefed pci_cleanup_aer_correct_error_status
PCI: unconditionally clear AER uncorr status register during cleanup
x86/PCI: claim SR-IOV BARs in pcibios_allocate_resource
PCI: portdrv: remove redundant definitions
PCI: portdrv: remove unnecessary struct pcie_port_data
PCI: portdrv: minor cleanup for pcie_port_device_register
PCI: portdrv: add missing irq cleanup
PCI: portdrv: enable device before irq initialization
PCI: portdrv: cleanup service irqs initialization
PCI: portdrv: check capabilities first
PCI: portdrv: move PME capability check
PCI: portdrv: remove redundant pcie type calculation
PCI: portdrv: cleanup pcie_device registration
PCI: portdrv: remove redundant pcie_port_device_probe
PCI: Always set prefetchable base/limit upper32 registers
PCI: read-modify-write the pcie device control register when initiating pcie flr
PCI: show dma_mask bits in /sys
...
Fixed up conflicts in:
arch/x86/kernel/amd_iommu_init.c
drivers/pci/dmar.c
drivers/pci/hotplug/acpiphp_glue.c
Diffstat (limited to 'drivers/xen/cpu_hotplug.c')
| -rw-r--r-- | drivers/xen/cpu_hotplug.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c index 0f765a920189..14e2d995e958 100644 --- a/drivers/xen/cpu_hotplug.c +++ b/drivers/xen/cpu_hotplug.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #include <linux/notifier.h> | 1 | #include <linux/notifier.h> |
| 2 | 2 | ||
| 3 | #include <xen/xen.h> | ||
| 3 | #include <xen/xenbus.h> | 4 | #include <xen/xenbus.h> |
| 4 | 5 | ||
| 5 | #include <asm/xen/hypervisor.h> | 6 | #include <asm/xen/hypervisor.h> |