projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[powerpc.git]
/
drivers
/
net
/
skge.h
diff --git
a/drivers/net/skge.h
b/drivers/net/skge.h
index
941f12a
..
1f1ce88
100644
(file)
--- a/
drivers/net/skge.h
+++ b/
drivers/net/skge.h
@@
-2402,7
+2402,6
@@
struct skge_hw {
struct tasklet_struct ext_tasklet;
spinlock_t phy_lock;
- spinlock_t hw_lock;
};
enum {
@@
-2419,7
+2418,6
@@
struct skge_port {
int port;
spinlock_t tx_lock;
- u32 tx_avail;
struct skge_ring tx_ring;
struct skge_ring rx_ring;