diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 18:43:08 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 18:43:08 +0200 |
| commit | f1b0c8d3d3b5ff9c0b14bb2383a4bc38d8922bd1 (patch) | |
| tree | b7d9f439d5b99d8b03bf490d4b17156414e48d45 /drivers/net/tokenring/smctr.h | |
| parent | d591b0a3ae25f587d0c4da1e1d1a425143590790 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/amd-iommu
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 88dfa2e01d6..52df7dd815c 100644 --- a/drivers/net/tokenring/smctr.h +++ b/drivers/net/tokenring/smctr.h @@ -1042,8 +1042,6 @@ typedef struct net_local { __u16 functional_address[2]; __u16 bitwise_group_address[2]; - const __u8 *ptr_ucode; - __u8 cleanup; struct sk_buff_head SendSkbQueue; |