Merge branch 'linus' into core/generic-dma-coherent

[linux-2.6] / drivers / net / cxgb3 / adapter.h

diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h
index 60a62f510db7b12bc525be5e958e58cbd52d23a9..acebe431d06897bd06ac7ca1ffd978cfaf757383 100644 (file)
--- a/drivers/net/cxgb3/adapter.h
+++ b/drivers/net/cxgb3/adapter.h
@@ -43,7 +43,6 @@
 #include <linux/mutex.h>
 #include <linux/bitops.h>
 #include "t3cdev.h"
-#include <asm/semaphore.h>
 #include <asm/io.h>
 
 struct vlan_group;
@@ -71,6 +70,8 @@ enum {                                /* adapter flags */
        USING_MSI = (1 << 1),
        USING_MSIX = (1 << 2),
        QUEUES_BOUND = (1 << 3),
+       TP_PARITY_INIT = (1 << 4),
+       NAPI_INIT = (1 << 5),
 };
 
 struct fl_pg_chunk {