diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 17:53:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 17:53:53 -0400 |
| commit | 871039f02f8ec4ab2e5e9010718caa8e085786f1 (patch) | |
| tree | f0d2b3127fc48c862967d68c46c2d46668137515 /drivers/net/lib82596.c | |
| parent | e4077e018b5ead3de9951fc01d8bf12eeeeeefed (diff) | |
| parent | 4a1032faac94ebbf647460ae3e06fc21146eb280 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/stmmac/stmmac_main.c
drivers/net/wireless/wl12xx/wl1271_cmd.c
drivers/net/wireless/wl12xx/wl1271_main.c
drivers/net/wireless/wl12xx/wl1271_spi.c
net/core/ethtool.c
net/mac80211/scan.c
Diffstat (limited to 'drivers/net/lib82596.c')
| -rw-r--r-- | drivers/net/lib82596.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c index fddaf921885..61c38ab4c24 100644 --- a/drivers/net/lib82596.c +++ b/drivers/net/lib82596.c | |||
| @@ -73,7 +73,6 @@ | |||
| 73 | #include <linux/string.h> | 73 | #include <linux/string.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/delay.h> | 77 | #include <linux/delay.h> |
| 79 | #include <linux/netdevice.h> | 78 | #include <linux/netdevice.h> |
| @@ -85,6 +84,7 @@ | |||
| 85 | #include <linux/dma-mapping.h> | 84 | #include <linux/dma-mapping.h> |
| 86 | #include <linux/io.h> | 85 | #include <linux/io.h> |
| 87 | #include <linux/irq.h> | 86 | #include <linux/irq.h> |
| 87 | #include <linux/gfp.h> | ||
| 88 | 88 | ||
| 89 | /* DEBUG flags | 89 | /* DEBUG flags |
| 90 | */ | 90 | */ |