diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 10:01:05 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 10:01:05 -0400 |
| commit | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (patch) | |
| tree | 3c688483e71261f564fc43be3157b337ae340dca /drivers/net/cxgb3/adapter.h | |
| parent | 34b2cd5b688b012975fcfc3b3970fc3508fa82c4 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linus' into x86/pebs
Diffstat (limited to 'drivers/net/cxgb3/adapter.h')
| -rw-r--r-- | drivers/net/cxgb3/adapter.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h index 4fdb13f8447b..acebe431d068 100644 --- a/drivers/net/cxgb3/adapter.h +++ b/drivers/net/cxgb3/adapter.h | |||
| @@ -71,6 +71,7 @@ enum { /* adapter flags */ | |||
| 71 | USING_MSIX = (1 << 2), | 71 | USING_MSIX = (1 << 2), |
| 72 | QUEUES_BOUND = (1 << 3), | 72 | QUEUES_BOUND = (1 << 3), |
| 73 | TP_PARITY_INIT = (1 << 4), | 73 | TP_PARITY_INIT = (1 << 4), |
| 74 | NAPI_INIT = (1 << 5), | ||
| 74 | }; | 75 | }; |
| 75 | 76 | ||
| 76 | struct fl_pg_chunk { | 77 | struct fl_pg_chunk { |