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/3c515.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/3c515.c')
| -rw-r--r-- | drivers/net/3c515.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c index 1e898b1c8068..2e17837be546 100644 --- a/drivers/net/3c515.c +++ b/drivers/net/3c515.c | |||
| @@ -65,7 +65,6 @@ static int max_interrupt_work = 20; | |||
| 65 | #include <linux/errno.h> | 65 | #include <linux/errno.h> |
| 66 | #include <linux/in.h> | 66 | #include <linux/in.h> |
| 67 | #include <linux/ioport.h> | 67 | #include <linux/ioport.h> |
| 68 | #include <linux/slab.h> | ||
| 69 | #include <linux/skbuff.h> | 68 | #include <linux/skbuff.h> |
| 70 | #include <linux/etherdevice.h> | 69 | #include <linux/etherdevice.h> |
| 71 | #include <linux/interrupt.h> | 70 | #include <linux/interrupt.h> |