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/tulip/winbond-840.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/tulip/winbond-840.c')
| -rw-r--r-- | drivers/net/tulip/winbond-840.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index 304f43866c44..98dbf6cc1d68 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c | |||
| @@ -114,7 +114,6 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; | |||
| 114 | #include <linux/timer.h> | 114 | #include <linux/timer.h> |
| 115 | #include <linux/errno.h> | 115 | #include <linux/errno.h> |
| 116 | #include <linux/ioport.h> | 116 | #include <linux/ioport.h> |
| 117 | #include <linux/slab.h> | ||
| 118 | #include <linux/interrupt.h> | 117 | #include <linux/interrupt.h> |
| 119 | #include <linux/pci.h> | 118 | #include <linux/pci.h> |
| 120 | #include <linux/dma-mapping.h> | 119 | #include <linux/dma-mapping.h> |