diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-10 09:32:46 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-10 09:32:46 -0400 |
| commit | 0ae28a35bcb7984838acbf28bfba9c030f8b74f0 (patch) | |
| tree | 4f449d929b5df9e126e839f388ff0fd2b52028a0 /drivers/net/82596.c | |
| parent | 6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5 (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/mtdcore.c
Pull in the bdi fixes and ARM platform changes that other outstanding
patches depend on.
Diffstat (limited to 'drivers/net/82596.c')
| -rw-r--r-- | drivers/net/82596.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index f94d17d78bb0..56e68db48861 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | #include <linux/string.h> | 45 | #include <linux/string.h> |
| 46 | #include <linux/errno.h> | 46 | #include <linux/errno.h> |
| 47 | #include <linux/ioport.h> | 47 | #include <linux/ioport.h> |
| 48 | #include <linux/slab.h> | ||
| 49 | #include <linux/interrupt.h> | 48 | #include <linux/interrupt.h> |
| 50 | #include <linux/delay.h> | 49 | #include <linux/delay.h> |
| 51 | #include <linux/netdevice.h> | 50 | #include <linux/netdevice.h> |
| @@ -53,6 +52,7 @@ | |||
| 53 | #include <linux/skbuff.h> | 52 | #include <linux/skbuff.h> |
| 54 | #include <linux/init.h> | 53 | #include <linux/init.h> |
| 55 | #include <linux/bitops.h> | 54 | #include <linux/bitops.h> |
| 55 | #include <linux/gfp.h> | ||
| 56 | 56 | ||
| 57 | #include <asm/io.h> | 57 | #include <asm/io.h> |
| 58 | #include <asm/dma.h> | 58 | #include <asm/dma.h> |