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/cs89x0.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/net/cs89x0.c')
| -rw-r--r-- | drivers/net/cs89x0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index b0208e474f7e..4c38491b8efb 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c | |||
| @@ -138,12 +138,12 @@ | |||
| 138 | #include <linux/ioport.h> | 138 | #include <linux/ioport.h> |
| 139 | #include <linux/in.h> | 139 | #include <linux/in.h> |
| 140 | #include <linux/skbuff.h> | 140 | #include <linux/skbuff.h> |
| 141 | #include <linux/slab.h> | ||
| 142 | #include <linux/spinlock.h> | 141 | #include <linux/spinlock.h> |
| 143 | #include <linux/string.h> | 142 | #include <linux/string.h> |
| 144 | #include <linux/init.h> | 143 | #include <linux/init.h> |
| 145 | #include <linux/bitops.h> | 144 | #include <linux/bitops.h> |
| 146 | #include <linux/delay.h> | 145 | #include <linux/delay.h> |
| 146 | #include <linux/gfp.h> | ||
| 147 | 147 | ||
| 148 | #include <asm/system.h> | 148 | #include <asm/system.h> |
| 149 | #include <asm/io.h> | 149 | #include <asm/io.h> |