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
/
smc911x.h
diff --git
a/drivers/net/smc911x.h
b/drivers/net/smc911x.h
index
7cc7cd7
..
76c17c2
100644
(file)
--- a/
drivers/net/smc911x.h
+++ b/
drivers/net/smc911x.h
@@
-79,7
+79,6
@@
struct smc911x_local {
/* work queue */
struct work_struct phy_configure;
- int work_pending;
int tx_throttle;
spinlock_t lock;