diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 07:34:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 07:34:42 -0400 |
| commit | 2e8844e13ab73f1107aea4317a53ff5879f2e1d7 (patch) | |
| tree | 36165371cf6fd26d674610f1c6bb5fac50e6e13f /include/net/atmclip.h | |
| parent | c78a3956b982418186e40978a51636a2b43221bc (diff) | |
| parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) | |
Merge branch 'linus' into tracing/hw-branch-tracing
Merge reason: update to latest tracing and ptrace APIs
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/net/atmclip.h')
| -rw-r--r-- | include/net/atmclip.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/atmclip.h b/include/net/atmclip.h index b5a51a7bb364..467c531b8a7e 100644 --- a/include/net/atmclip.h +++ b/include/net/atmclip.h | |||
| @@ -50,7 +50,6 @@ struct atmarp_entry { | |||
| 50 | struct clip_priv { | 50 | struct clip_priv { |
| 51 | int number; /* for convenience ... */ | 51 | int number; /* for convenience ... */ |
| 52 | spinlock_t xoff_lock; /* ensures that pop is atomic (SMP) */ | 52 | spinlock_t xoff_lock; /* ensures that pop is atomic (SMP) */ |
| 53 | struct net_device_stats stats; | ||
| 54 | struct net_device *next; /* next CLIP interface */ | 53 | struct net_device *next; /* next CLIP interface */ |
| 55 | }; | 54 | }; |
| 56 | 55 | ||