projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-microblaze.git]
/
drivers
/
net
/
ethernet
/
qlogic
/
qlcnic
/
qlcnic_init.c
diff --git
a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
index
3d61a76
..
09f20c7
100644
(file)
--- a/
drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
+++ b/
drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
@@
-437,7
+437,6
@@
int qlcnic_pinit_from_rom(struct qlcnic_adapter *adapter)
QLCWR32(adapter, QLCNIC_CRB_PEG_NET_4 + 0x3c, 1);
msleep(20);
- qlcnic_rom_unlock(adapter);
/* big hammer don't reset CAM block on reset */
QLCWR32(adapter, QLCNIC_ROMUSB_GLB_SW_RESET, 0xfeffffff);