diff options
| author |   Amit Kumar Salecha <amit.salecha@qlogic.com> | 2009-11-29 21:54:55 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-11-29 21:54:55 -0800 |
| commit | e7473f12be7712aafe6df163222f26caadee1175 (patch) | |
| tree | bb7b1aec356b3f7120ee5a044b087ae471e0be92 /drivers/net/netxen | |
| parent | sfc: Update version, copyright dates, authors (diff) | |
| download | linux-dev-e7473f12be7712aafe6df163222f26caadee1175.tar.xz linux-dev-e7473f12be7712aafe6df163222f26caadee1175.zip | |
netxen: fix merge 9b963e5d0e01461099a
Patch "fix memory initialization:5d521fd36de4e61" didn't got merge.
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netxen')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c index 6ee27a630d89..80a667460514 100644 --- 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; |