diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /drivers/net/hamradio/scc.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/net/hamradio/scc.c')
| -rw-r--r-- | drivers/net/hamradio/scc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index 35c936175bba..f3a96b843911 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c | |||
| @@ -158,7 +158,6 @@ | |||
| 158 | #include <linux/in.h> | 158 | #include <linux/in.h> |
| 159 | #include <linux/fcntl.h> | 159 | #include <linux/fcntl.h> |
| 160 | #include <linux/ptrace.h> | 160 | #include <linux/ptrace.h> |
| 161 | #include <linux/slab.h> | ||
| 162 | #include <linux/delay.h> | 161 | #include <linux/delay.h> |
| 163 | #include <linux/skbuff.h> | 162 | #include <linux/skbuff.h> |
| 164 | #include <linux/netdevice.h> | 163 | #include <linux/netdevice.h> |