aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/smc911x.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-06-13 23:52:39 -0400
committerDavid S. Miller <davem@davemloft.net>2008-06-13 23:52:39 -0400
commit4ae127d1b6c71f9240dd4245f240e6dd8fc98014 (patch)
treeb7aa27b3e0c655f4613fe2146cb57d7f69e421f6 /drivers/net/smc911x.h
parent875ec4333b99144e2589e900a0bcd2c25c757b27 (diff)
parent7775c9753b94fe429dc4323360d6502c95e0dd6e (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/smc911x.c
Diffstat (limited to 'drivers/net/smc911x.h')
-rw-r--r--drivers/net/smc911x.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
index 7cc7cd7e99cd..76c17c28fab4 100644
--- a/drivers/net/smc911x.h
+++ b/drivers/net/smc911x.h
@@ -79,7 +79,6 @@ struct smc911x_local {
79 79
80 /* work queue */ 80 /* work queue */
81 struct work_struct phy_configure; 81 struct work_struct phy_configure;
82 int work_pending;
83 82
84 int tx_throttle; 83 int tx_throttle;
85 spinlock_t lock; 84 spinlock_t lock;