git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
drivers
/
net
/
bnx2.h
diff --git
a/drivers/net/bnx2.h
b/drivers/net/bnx2.h
index
16020a1
..
be7ccb5
100644
(file)
--- a/
drivers/net/bnx2.h
+++ b/
drivers/net/bnx2.h
@@
-6656,7
+6656,6
@@
struct bnx2 {
int current_interval;
struct timer_list timer;
struct work_struct reset_task;
- int in_reset_task;
/* Used to synchronize phy accesses. */
spinlock_t phy_lock;