diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /drivers/net/typhoon.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/typhoon.c')
| -rw-r--r-- | drivers/net/typhoon.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index cd24e5f2b2a2..98d818daa77e 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c | |||
| @@ -109,7 +109,6 @@ static const int multicast_filter_limit = 32; | |||
| 109 | #include <linux/timer.h> | 109 | #include <linux/timer.h> |
| 110 | #include <linux/errno.h> | 110 | #include <linux/errno.h> |
| 111 | #include <linux/ioport.h> | 111 | #include <linux/ioport.h> |
| 112 | #include <linux/slab.h> | ||
| 113 | #include <linux/interrupt.h> | 112 | #include <linux/interrupt.h> |
| 114 | #include <linux/pci.h> | 113 | #include <linux/pci.h> |
| 115 | #include <linux/netdevice.h> | 114 | #include <linux/netdevice.h> |