Commit e7473f12 authored by Amit Kumar Salecha's avatar Amit Kumar Salecha Committed by David S. Miller

netxen: fix merge 9b963e5d

Patch "fix memory initialization:5d521fd3" didn't got merge.
Signed-off-by: default avatarAmit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 906bb26c
...@@ -528,6 +528,8 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter) ...@@ -528,6 +528,8 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter)
continue; continue;
if (off == (ROMUSB_GLB + 0x1c)) /* MS clock */ if (off == (ROMUSB_GLB + 0x1c)) /* MS clock */
continue; continue;
if ((off & 0x0ff00000) == NETXEN_CRB_DDR_NET)
continue;
if (off == (NETXEN_CRB_PEG_NET_1 + 0x18) && if (off == (NETXEN_CRB_PEG_NET_1 + 0x18) &&
!NX_IS_REVISION_P3P(adapter->ahw.revision_id)) !NX_IS_REVISION_P3P(adapter->ahw.revision_id))
buf[i].data = 0x1020; buf[i].data = 0x1020;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment