diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
| commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
| tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /include/linux/if_tr.h | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/linux/if_tr.h')
| -rw-r--r-- | include/linux/if_tr.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/if_tr.h b/include/linux/if_tr.h index 046e9d95ba9a..5bcec8b2c5e2 100644 --- a/include/linux/if_tr.h +++ b/include/linux/if_tr.h | |||
| @@ -49,9 +49,6 @@ static inline struct trh_hdr *tr_hdr(const struct sk_buff *skb) | |||
| 49 | { | 49 | { |
| 50 | return (struct trh_hdr *)skb_mac_header(skb); | 50 | return (struct trh_hdr *)skb_mac_header(skb); |
| 51 | } | 51 | } |
| 52 | #ifdef CONFIG_SYSCTL | ||
| 53 | extern struct ctl_table tr_table[]; | ||
| 54 | #endif | ||
| 55 | #endif | 52 | #endif |
| 56 | 53 | ||
| 57 | /* This is an Token-Ring LLC structure */ | 54 | /* This is an Token-Ring LLC structure */ |