diff options
| author | Steven Whitehouse | 2006-09-21 16:18:14 +0200 |
|---|---|---|
| committer | Steven Whitehouse | 2006-09-21 16:18:14 +0200 |
| commit | 91fa47964165a42401fbc1f41caa63ab78564305 (patch) | |
| tree | 8f4ffdcbdedd845563630c3bcacd9407c75ccb52 /arch/i386/pci/pci.h | |
| parent | [GFS2] Remove unused constants (diff) | |
| parent | Linux v2.6.18. Arrr! (diff) | |
| download | kernel-qcow2-linux-91fa47964165a42401fbc1f41caa63ab78564305.tar.gz kernel-qcow2-linux-91fa47964165a42401fbc1f41caa63ab78564305.tar.xz kernel-qcow2-linux-91fa47964165a42401fbc1f41caa63ab78564305.zip | |
Merge branch 'master' into gfs2
Diffstat (limited to 'arch/i386/pci/pci.h')
| -rw-r--r-- | arch/i386/pci/pci.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/i386/pci/pci.h b/arch/i386/pci/pci.h index 49a849b3a241..bf4e79335388 100644 --- a/arch/i386/pci/pci.h +++ b/arch/i386/pci/pci.h @@ -16,8 +16,7 @@ #define PCI_PROBE_CONF1 0x0002 #define PCI_PROBE_CONF2 0x0004 #define PCI_PROBE_MMCONF 0x0008 -#define PCI_PROBE_MMCONF_FORCE 0x0010 -#define PCI_PROBE_MASK 0x00ff +#define PCI_PROBE_MASK 0x000f #define PCI_NO_SORT 0x0100 #define PCI_BIOS_SORT 0x0200 |