diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-31 15:45:48 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-31 15:45:48 +1000 |
| commit | aa43f77939c97bf9d3580c6a5e71a5a40290e451 (patch) | |
| tree | 095c0b8b3da4b6554a3f8ef4b39240a5d9216d4d /arch/i386/pci/pci.h | |
| parent | 2818c5dec5e28d65d52afbb7695bbbafe6377ee5 (diff) | |
| parent | 4c15343167b5febe7bb0ba96aad5bef42ae94d3b (diff) | |
| download | op-kernel-dev-aa43f77939c97bf9d3580c6a5e71a5a40290e451.zip op-kernel-dev-aa43f77939c97bf9d3580c6a5e71a5a40290e451.tar.gz | |
Merge branch 'merge'
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 bf4e793..49a849b 100644 --- a/arch/i386/pci/pci.h +++ b/arch/i386/pci/pci.h @@ -16,7 +16,8 @@ #define PCI_PROBE_CONF1 0x0002 #define PCI_PROBE_CONF2 0x0004 #define PCI_PROBE_MMCONF 0x0008 -#define PCI_PROBE_MASK 0x000f +#define PCI_PROBE_MMCONF_FORCE 0x0010 +#define PCI_PROBE_MASK 0x00ff #define PCI_NO_SORT 0x0100 #define PCI_BIOS_SORT 0x0200 |
