diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:41:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:41:37 -0400 |
| commit | f9bcda7760e1373615c9f6d9ce24209b0ab97de1 (patch) | |
| tree | f90b3031126c4e4beb8161f38ea436303e2b8b73 /arch/i386/pci/pci.h | |
| parent | 9bec2e38527a9f2497b3d976715c672d08d6160d (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/i386/pci/pci.h')
| -rw-r--r-- | arch/i386/pci/pci.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/i386/pci/pci.h b/arch/i386/pci/pci.h index bf4e79335388..49a849b3a241 100644 --- a/arch/i386/pci/pci.h +++ b/arch/i386/pci/pci.h | |||
| @@ -16,7 +16,8 @@ | |||
| 16 | #define PCI_PROBE_CONF1 0x0002 | 16 | #define PCI_PROBE_CONF1 0x0002 |
| 17 | #define PCI_PROBE_CONF2 0x0004 | 17 | #define PCI_PROBE_CONF2 0x0004 |
| 18 | #define PCI_PROBE_MMCONF 0x0008 | 18 | #define PCI_PROBE_MMCONF 0x0008 |
| 19 | #define PCI_PROBE_MASK 0x000f | 19 | #define PCI_PROBE_MMCONF_FORCE 0x0010 |
| 20 | #define PCI_PROBE_MASK 0x00ff | ||
| 20 | 21 | ||
| 21 | #define PCI_NO_SORT 0x0100 | 22 | #define PCI_NO_SORT 0x0100 |
| 22 | #define PCI_BIOS_SORT 0x0200 | 23 | #define PCI_BIOS_SORT 0x0200 |