diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-07-15 15:19:14 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-07-15 15:19:14 -0400 |
| commit | 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (patch) | |
| tree | 313b3b9ca04727f3704464e01d8dd97da1dd534b /drivers/net/tokenring/smctr.h | |
| parent | 19c1d6a34abf73d0baf8e325d018c920fa78dddc (diff) | |
| parent | b9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-rmk
Diffstat (limited to 'drivers/net/tokenring/smctr.h')
| -rw-r--r-- | drivers/net/tokenring/smctr.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/tokenring/smctr.h b/drivers/net/tokenring/smctr.h index 88dfa2e01d6e..52df7dd815cc 100644 --- a/drivers/net/tokenring/smctr.h +++ b/drivers/net/tokenring/smctr.h | |||
| @@ -1042,8 +1042,6 @@ typedef struct net_local { | |||
| 1042 | __u16 functional_address[2]; | 1042 | __u16 functional_address[2]; |
| 1043 | __u16 bitwise_group_address[2]; | 1043 | __u16 bitwise_group_address[2]; |
| 1044 | 1044 | ||
| 1045 | const __u8 *ptr_ucode; | ||
| 1046 | |||
| 1047 | __u8 cleanup; | 1045 | __u8 cleanup; |
| 1048 | 1046 | ||
| 1049 | struct sk_buff_head SendSkbQueue; | 1047 | struct sk_buff_head SendSkbQueue; |