projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
netxen: fix merge 9b963e5d0e01461099a
[linux-2.6-block.git]
/
drivers
/
net
/
netxen
/
netxen_nic_init.c
diff --git
a/drivers/net/netxen/netxen_nic_init.c
b/drivers/net/netxen/netxen_nic_init.c
index 6ee27a630d892b04e93f62fe05f027707ca9ddcb..80a66746051485016180ccfcd49a56002297f8cd 100644
(file)
--- a/
drivers/net/netxen/netxen_nic_init.c
+++ b/
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;