diff options
| author | James Morris <jmorris@namei.org> | 2010-05-05 20:56:07 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-05 20:56:07 -0400 |
| commit | 0ffbe2699cda6afbe08501098dff8a8c2fe6ae09 (patch) | |
| tree | 81b1a2305d16c873371b65c5a863c0268036cefe /drivers/net/via-rhine.c | |
| parent | 4e5d6f7ec3833c0da9cf34fa5c53c6058c5908b6 (diff) | |
| parent | 7ebd467551ed6ae200d7835a84bbda0dcadaa511 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/net/via-rhine.c')
| -rw-r--r-- | drivers/net/via-rhine.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index 50f881aa3939..388751aa66e0 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c | |||
| @@ -89,7 +89,6 @@ static const int multicast_filter_limit = 32; | |||
| 89 | #include <linux/timer.h> | 89 | #include <linux/timer.h> |
| 90 | #include <linux/errno.h> | 90 | #include <linux/errno.h> |
| 91 | #include <linux/ioport.h> | 91 | #include <linux/ioport.h> |
| 92 | #include <linux/slab.h> | ||
| 93 | #include <linux/interrupt.h> | 92 | #include <linux/interrupt.h> |
| 94 | #include <linux/pci.h> | 93 | #include <linux/pci.h> |
| 95 | #include <linux/dma-mapping.h> | 94 | #include <linux/dma-mapping.h> |