diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /include/linux/if_frad.h | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
Diffstat (limited to 'include/linux/if_frad.h')
| -rw-r--r-- | include/linux/if_frad.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h index 60e16a551dd6..673f2209453d 100644 --- a/include/linux/if_frad.h +++ b/include/linux/if_frad.h | |||
| @@ -153,7 +153,6 @@ struct frhdr | |||
| 153 | 153 | ||
| 154 | struct dlci_local | 154 | struct dlci_local |
| 155 | { | 155 | { |
| 156 | struct net_device_stats stats; | ||
| 157 | struct net_device *master; | 156 | struct net_device *master; |
| 158 | struct net_device *slave; | 157 | struct net_device *slave; |
| 159 | struct dlci_conf config; | 158 | struct dlci_conf config; |