diff options
| author | Ingo Molnar | 2008-07-18 10:14:56 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-18 10:14:56 +0200 |
| commit | 48ae74443403ab25876959e84785f61bf421ccef (patch) | |
| tree | dd6d8277f2f0e691edf49a38ff9a804f9a1532d0 /arch/x86/pci/pci.h | |
| parent | Merge branch 'x86/step' of git://git.kernel.org/pub/scm/linux/kernel/git/frob... (diff) | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | kernel-qcow2-linux-48ae74443403ab25876959e84785f61bf421ccef.tar.gz kernel-qcow2-linux-48ae74443403ab25876959e84785f61bf421ccef.tar.xz kernel-qcow2-linux-48ae74443403ab25876959e84785f61bf421ccef.zip | |
Merge branch 'linus' into x86/step
Diffstat (limited to 'arch/x86/pci/pci.h')
| -rw-r--r-- | arch/x86/pci/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/pci/pci.h b/arch/x86/pci/pci.h index b2270a55b0cf..3e25deb821ac 100644 --- a/arch/x86/pci/pci.h +++ b/arch/x86/pci/pci.h @@ -28,6 +28,7 @@ #define PCI_USE__CRS 0x10000 #define PCI_CHECK_ENABLE_AMD_MMCONF 0x20000 #define PCI_HAS_IO_ECS 0x40000 +#define PCI_NOASSIGN_ROMS 0x80000 extern unsigned int pci_probe; extern unsigned long pirq_table_addr; |