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/acenic.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/net/acenic.c')
| -rw-r--r-- | drivers/net/acenic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c index 4ae750ef1e10..97a3dfd94dfa 100644 --- a/drivers/net/acenic.c +++ b/drivers/net/acenic.c | |||
| @@ -67,6 +67,7 @@ | |||
| 67 | #include <linux/highmem.h> | 67 | #include <linux/highmem.h> |
| 68 | #include <linux/sockios.h> | 68 | #include <linux/sockios.h> |
| 69 | #include <linux/firmware.h> | 69 | #include <linux/firmware.h> |
| 70 | #include <linux/slab.h> | ||
| 70 | 71 | ||
| 71 | #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) | 72 | #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) |
| 72 | #include <linux/if_vlan.h> | 73 | #include <linux/if_vlan.h> |