---

yaml --- r: 170646 b: refs/heads/master c: 993ac7b h: refs/heads/master v: v3
git-mirror · Oct 12, 2009 · 668a756 · 668a756
1 parent 221565a
commit 668a756
Show file tree

Hide file tree

Showing 4 changed files with 405 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37b091bacba7bd329eced9a56998b6247da414c4
+refs/heads/master: 993ac7b5183f82edc9696cd17faae03523e00e09
diff --git a/trunk/drivers/net/bnx2x.h b/trunk/drivers/net/bnx2x.h
@@ -24,6 +24,10 @@
 #define BCM_VLAN			1
 #endif
 
+#if defined(CONFIG_CNIC) || defined(CONFIG_CNIC_MODULE)
+#define BCM_CNIC 1
+#include "cnic_if.h"
+#endif
 
 #define BNX2X_MULTI_QUEUE