diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/net/bnx2x_reg.h | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/net/bnx2x_reg.h')
| -rw-r--r-- | drivers/net/bnx2x_reg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bnx2x_reg.h b/drivers/net/bnx2x_reg.h index aa76cbada5e2..732eafdeb0f2 100644 --- a/drivers/net/bnx2x_reg.h +++ b/drivers/net/bnx2x_reg.h | |||
| @@ -2536,7 +2536,7 @@ | |||
| 2536 | /* [RC 1] A flag to indicate that overflow error occurred in one of the | 2536 | /* [RC 1] A flag to indicate that overflow error occurred in one of the |
| 2537 | queues. */ | 2537 | queues. */ |
| 2538 | #define QM_REG_OVFERROR 0x16805c | 2538 | #define QM_REG_OVFERROR 0x16805c |
| 2539 | /* [RC 7] the Q were the qverflow occurs */ | 2539 | /* [RC 7] the Q where the overflow occurs */ |
| 2540 | #define QM_REG_OVFQNUM 0x168058 | 2540 | #define QM_REG_OVFQNUM 0x168058 |
| 2541 | /* [R 16] Pause state for physical queues 15-0 */ | 2541 | /* [R 16] Pause state for physical queues 15-0 */ |
| 2542 | #define QM_REG_PAUSESTATE0 0x168410 | 2542 | #define QM_REG_PAUSESTATE0 0x168410 |