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/3c59x.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/3c59x.c')
| -rw-r--r-- | drivers/net/3c59x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index f965431f4924..5f92fdbe66e2 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
| @@ -77,7 +77,6 @@ static int vortex_debug = 1; | |||
| 77 | #include <linux/errno.h> | 77 | #include <linux/errno.h> |
| 78 | #include <linux/in.h> | 78 | #include <linux/in.h> |
| 79 | #include <linux/ioport.h> | 79 | #include <linux/ioport.h> |
| 80 | #include <linux/slab.h> | ||
| 81 | #include <linux/interrupt.h> | 80 | #include <linux/interrupt.h> |
| 82 | #include <linux/pci.h> | 81 | #include <linux/pci.h> |
| 83 | #include <linux/mii.h> | 82 | #include <linux/mii.h> |
| @@ -90,6 +89,7 @@ static int vortex_debug = 1; | |||
| 90 | #include <linux/eisa.h> | 89 | #include <linux/eisa.h> |
| 91 | #include <linux/bitops.h> | 90 | #include <linux/bitops.h> |
| 92 | #include <linux/jiffies.h> | 91 | #include <linux/jiffies.h> |
| 92 | #include <linux/gfp.h> | ||
| 93 | #include <asm/irq.h> /* For nr_irqs only. */ | 93 | #include <asm/irq.h> /* For nr_irqs only. */ |
| 94 | #include <asm/io.h> | 94 | #include <asm/io.h> |
| 95 | #include <asm/uaccess.h> | 95 | #include <asm/uaccess.h> |