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/fs_enet/mac-fcc.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/net/fs_enet/mac-fcc.c')
| -rw-r--r-- | drivers/net/fs_enet/mac-fcc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c index cf4f674f9e2e..0a973e71876b 100644 --- a/drivers/net/fs_enet/mac-fcc.c +++ b/drivers/net/fs_enet/mac-fcc.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/ptrace.h> | 19 | #include <linux/ptrace.h> |
| 20 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
| 21 | #include <linux/ioport.h> | 21 | #include <linux/ioport.h> |
| 22 | #include <linux/slab.h> | ||
| 23 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| @@ -34,6 +33,7 @@ | |||
| 34 | #include <linux/platform_device.h> | 33 | #include <linux/platform_device.h> |
| 35 | #include <linux/phy.h> | 34 | #include <linux/phy.h> |
| 36 | #include <linux/of_device.h> | 35 | #include <linux/of_device.h> |
| 36 | #include <linux/gfp.h> | ||
| 37 | 37 | ||
| 38 | #include <asm/immap_cpm2.h> | 38 | #include <asm/immap_cpm2.h> |
| 39 | #include <asm/mpc8260.h> | 39 | #include <asm/mpc8260.h> |