---

yaml --- r: 172029 b: refs/heads/master c: e7473f1 h: refs/heads/master i: 172027: add2d4e v: v3
git-mirror · Nov 30, 2009 · fa3f8fc · fa3f8fc
1 parent 70312a7
commit fa3f8fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 906bb26c0624d87df74e6642f2d74cde176fcc12
+refs/heads/master: e7473f12be7712aafe6df163222f26caadee1175
diff --git a/trunk/drivers/net/netxen/netxen_nic_init.c b/trunk/drivers/net/netxen/netxen_nic_init.c
@@ -528,6 +528,8 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter)
 				continue;
 			if (off == (ROMUSB_GLB + 0x1c)) /* MS clock */
 				continue;
+			if ((off & 0x0ff00000) == NETXEN_CRB_DDR_NET)
+				continue;
 			if (off == (NETXEN_CRB_PEG_NET_1 + 0x18) &&
 				!NX_IS_REVISION_P3P(adapter->ahw.revision_id))
 				buf[i].data = 0x1020;