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/myri_sbus.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/net/myri_sbus.c')
| -rw-r--r-- | drivers/net/myri_sbus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c index 8b4313085359..b72e749afdf1 100644 --- a/drivers/net/myri_sbus.c +++ b/drivers/net/myri_sbus.c | |||
| @@ -14,7 +14,6 @@ static char version[] = | |||
| 14 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
| 15 | #include <linux/ioport.h> | 15 | #include <linux/ioport.h> |
| 16 | #include <linux/in.h> | 16 | #include <linux/in.h> |
| 17 | #include <linux/slab.h> | ||
| 18 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 19 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| @@ -26,6 +25,7 @@ static char version[] = | |||
| 26 | #include <linux/of.h> | 25 | #include <linux/of.h> |
| 27 | #include <linux/of_device.h> | 26 | #include <linux/of_device.h> |
| 28 | #include <linux/firmware.h> | 27 | #include <linux/firmware.h> |
| 28 | #include <linux/gfp.h> | ||
| 29 | 29 | ||
| 30 | #include <net/dst.h> | 30 | #include <net/dst.h> |
| 31 | #include <net/arp.h> | 31 | #include <net/arp.h> |