diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
| commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
| tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /drivers/net/epic100.c | |
| parent | e182c77cc291456eed127b1472952ddb59a81a9d (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'drivers/net/epic100.c')
| -rw-r--r-- | drivers/net/epic100.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c index 39c271b6be44..7a567201e829 100644 --- a/drivers/net/epic100.c +++ b/drivers/net/epic100.c | |||
| @@ -73,7 +73,6 @@ static int rx_copybreak; | |||
| 73 | #include <linux/timer.h> | 73 | #include <linux/timer.h> |
| 74 | #include <linux/errno.h> | 74 | #include <linux/errno.h> |
| 75 | #include <linux/ioport.h> | 75 | #include <linux/ioport.h> |
| 76 | #include <linux/slab.h> | ||
| 77 | #include <linux/interrupt.h> | 76 | #include <linux/interrupt.h> |
| 78 | #include <linux/pci.h> | 77 | #include <linux/pci.h> |
| 79 | #include <linux/delay.h> | 78 | #include <linux/delay.h> |