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 /net/can/raw.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'net/can/raw.c')
| -rw-r--r-- | net/can/raw.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/can/raw.c b/net/can/raw.c index abca920440b5..3a7dffb6519c 100644 --- a/net/can/raw.c +++ b/net/can/raw.c | |||
| @@ -45,6 +45,7 @@ | |||
| 45 | #include <linux/init.h> | 45 | #include <linux/init.h> |
| 46 | #include <linux/uio.h> | 46 | #include <linux/uio.h> |
| 47 | #include <linux/net.h> | 47 | #include <linux/net.h> |
| 48 | #include <linux/slab.h> | ||
| 48 | #include <linux/netdevice.h> | 49 | #include <linux/netdevice.h> |
| 49 | #include <linux/socket.h> | 50 | #include <linux/socket.h> |
| 50 | #include <linux/if_arp.h> | 51 | #include <linux/if_arp.h> |