diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-06 18:35:18 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-06 18:35:18 -0400 |
| commit | 67d340f440f389e9d56201fb7c7aaa92f262feb1 (patch) | |
| tree | a96c26a370beb23282a561ddd936e5d0aa93adde /drivers/net/skge.h | |
| parent | 2ba3e3e65cf182436757ba13ea8d564e2950fb56 (diff) | |
| parent | 159f597a8bd0f1d7650d5e580c93a2666c9c26d1 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/net/skge.h')
| -rw-r--r-- | drivers/net/skge.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/skge.h b/drivers/net/skge.h index 14d0cc01fb9a..fced3d2bc072 100644 --- a/drivers/net/skge.h +++ b/drivers/net/skge.h | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | /* PCI config registers */ | 7 | /* PCI config registers */ |
| 8 | #define PCI_DEV_REG1 0x40 | 8 | #define PCI_DEV_REG1 0x40 |
| 9 | #define PCI_DEV_REG2 0x44 | 9 | #define PCI_DEV_REG2 0x44 |
| 10 | #define PCI_REV_DESC 0x4 | ||
| 10 | 11 | ||
| 11 | #define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \ | 12 | #define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \ |
| 12 | PCI_STATUS_SIG_SYSTEM_ERROR | \ | 13 | PCI_STATUS_SIG_SYSTEM_ERROR | \ |