diff options
| author | Linus Torvalds | 2007-10-13 00:50:23 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2007-10-13 00:50:23 +0200 |
| commit | 6a84258e5f5bb8b9bd72e06a5837fa6fdacaf5c5 (patch) | |
| tree | 3c4911a489c85e908b0ef3ed83d78264788f858c /arch/x86/pci/pci.h | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 (diff) | |
| parent | PCI: merge almost all of pci_32.h and pci_64.h together (diff) | |
| download | kernel-qcow2-linux-6a84258e5f5bb8b9bd72e06a5837fa6fdacaf5c5.tar.gz kernel-qcow2-linux-6a84258e5f5bb8b9bd72e06a5837fa6fdacaf5c5.tar.xz kernel-qcow2-linux-6a84258e5f5bb8b9bd72e06a5837fa6fdacaf5c5.zip | |
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: (37 commits)
PCI: merge almost all of pci_32.h and pci_64.h together
PCI: X86: Introduce and enable PCI domain support
PCI: Add 'nodomains' boot option, and pci_domains_supported global
PCI: modify PCI bridge control ISA flag for clarity
PCI: use _CRS for PCI resource allocation
PCI: avoid P2P prefetch window for expansion ROMs
PCI: skip ISA ioresource alignment on some systems
PCI: remove transparent bridge sizing
pci: write file size to inode on proc bus file write
pci: use size stored in proc_dir_entry for proc bus files
pci: implement "pci=noaer"
PCI: fix IDE legacy mode resources
MSI: Use correct data offset for 32-bit MSI in read_msi_msg()
PCI: Fix incorrect argument order to list_add_tail() in PCI dynamic ID code
PCI: i386: Compaq EVO N800c needs PCI bus renumbering
PCI: Remove no longer correct documentation regarding MSI vector assignment
PCI: re-enable onboard sound on "MSI K8T Neo2-FIR"
PCI: quirk_vt82c586_acpi: Omit reading PCI revision ID
PCI: quirk amd_8131_mmrbc: Omit reading pci revision ID
cpqphp: Use PCI_CLASS_REVISION instead of PCI_REVISION_ID for read
...
Diffstat (limited to 'arch/x86/pci/pci.h')
| -rw-r--r-- | arch/x86/pci/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/pci/pci.h b/arch/x86/pci/pci.h index 8c66f275756f..ac56d3916c50 100644 --- a/arch/x86/pci/pci.h +++ b/arch/x86/pci/pci.h @@ -26,6 +26,8 @@ #define PCI_ASSIGN_ROMS 0x1000 #define PCI_BIOS_IRQ_SCAN 0x2000 #define PCI_ASSIGN_ALL_BUSSES 0x4000 +#define PCI_CAN_SKIP_ISA_ALIGN 0x8000 +#define PCI_USE__CRS 0x10000 extern unsigned int pci_probe; extern unsigned long pirq_table_addr; |