diff options
| author | Jon Loeliger <jdl@freescale.com> | 2006-08-09 14:41:17 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2006-08-09 14:41:17 -0500 |
| commit | 92c427b18982167064de454ae5248ec466998919 (patch) | |
| tree | a60a3a9e3f3dec07edf6e6505bfc45c9e0a2dc01 /include/pci.h | |
| parent | 281f69ede28cd3d8be5d62a96b5a0b73e6065858 (diff) | |
| parent | 34c3c0e01dbf1f8cc2bd08de92f2b89ba84921eb (diff) | |
Merge branch 'mpc85xx'
Conflicts:
include/ft_build.h
include/pci.h
Resolved, though.
Diffstat (limited to 'include/pci.h')
| -rw-r--r-- | include/pci.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/pci.h b/include/pci.h index 705d1fcd8..e0e8783a7 100644 --- a/include/pci.h +++ b/include/pci.h @@ -271,11 +271,14 @@ #define PCI_AGP_SIZEOF 12 /* PCI-X registers */ -#define PCI_X_CMD_DPERR_E 0x0001 /* Data Parity Error Recovery Enable */+#define PCI_X_CMD_ERO 0x0002 /* Enable Relaxed Ordering */ + +#define PCI_X_CMD_DPERR_E 0x0001 /* Data Parity Error Recovery Enable */ +#define PCI_X_CMD_ERO 0x0002 /* Enable Relaxed Ordering */ #define PCI_X_CMD_MAX_READ 0x0000 /* Max Memory Read Byte Count */ #define PCI_X_CMD_MAX_SPLIT 0x0030 /* Max Outstanding Split Transactions */ #define PCI_X_CMD_VERSION(x) (((x) >> 12) & 3) /* Version */ + /* Slot Identification */ #define PCI_SID_ESR 2 /* Expansion Slot Register */ |