diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 23:34:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 23:34:14 +0100 |
| commit | 38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4 (patch) | |
| tree | a83d5e4e86edf6cb2de22db6f2ff2274753a2bab /drivers/net/tokenring/smctr.h | |
| parent | f2d28a2ebcb525a6ec7e2152106ddb385ef52b73 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
| download | linux-38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4.tar.gz linux-38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4.tar.bz2 linux-38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4.zip | |
Merge branch 'linus' into core/printk
Diffstat (limited to 'drivers/net/tokenring/smctr.h')
| -rw-r--r-- | drivers/net/tokenring/smctr.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/tokenring/smctr.h b/drivers/net/tokenring/smctr.h index 52df7dd815cc..6e5700ab4fc3 100644 --- a/drivers/net/tokenring/smctr.h +++ b/drivers/net/tokenring/smctr.h @@ -977,7 +977,6 @@ typedef struct net_local { __u8 monitor_state_ready; __u16 ring_status; __u8 ring_status_flags; - __u8 current_ring_status; __u8 state; __u8 join_state; |