diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 09:15:40 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 09:15:40 (GMT) |
| commit | 5e34437840d33554f69380584311743b39e8fbeb (patch) | |
| tree | e081135619ee146af5efb9ee883afca950df5757 /include/net/netrom.h | |
| parent | 77d05632baee21b1cef8730d7c06aa69601e4dca (diff) | |
| parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) | |
| download | linux-5e34437840d33554f69380584311743b39e8fbeb.tar.xz | |
Merge branch 'linus' into core/softlockup
Conflicts:
kernel/sysctl.c
Diffstat (limited to 'include/net/netrom.h')
| -rw-r--r-- | include/net/netrom.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/net/netrom.h b/include/net/netrom.h index f06852b..15696b1 100644 --- a/include/net/netrom.h +++ b/include/net/netrom.h @@ -59,10 +59,6 @@ enum { #define NR_MAX_WINDOW_SIZE 127 /* Maximum Window Allowable - 127 */ #define NR_MAX_PACKET_SIZE 236 /* Maximum Packet Length - 236 */ -struct nr_private { - struct net_device_stats stats; -}; - struct nr_sock { struct sock sock; ax25_address user_addr, source_addr, dest_addr; |