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/hamachi.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/net/hamachi.c')
| -rw-r--r-- | drivers/net/hamachi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c index 373546dd0831..5d6f13879592 100644 --- a/drivers/net/hamachi.c +++ b/drivers/net/hamachi.c | |||
| @@ -153,7 +153,6 @@ static int tx_params[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; | |||
| 153 | #include <linux/time.h> | 153 | #include <linux/time.h> |
| 154 | #include <linux/errno.h> | 154 | #include <linux/errno.h> |
| 155 | #include <linux/ioport.h> | 155 | #include <linux/ioport.h> |
| 156 | #include <linux/slab.h> | ||
| 157 | #include <linux/interrupt.h> | 156 | #include <linux/interrupt.h> |
| 158 | #include <linux/pci.h> | 157 | #include <linux/pci.h> |
| 159 | #include <linux/init.h> | 158 | #include <linux/init.h> |