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/tulip/de4x5.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/tulip/de4x5.c')
| -rw-r--r-- | drivers/net/tulip/de4x5.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c index cac4bcc83187..d818456f4713 100644 --- a/drivers/net/tulip/de4x5.c +++ b/drivers/net/tulip/de4x5.c | |||
| @@ -450,7 +450,6 @@ | |||
| 450 | #include <linux/ptrace.h> | 450 | #include <linux/ptrace.h> |
| 451 | #include <linux/errno.h> | 451 | #include <linux/errno.h> |
| 452 | #include <linux/ioport.h> | 452 | #include <linux/ioport.h> |
| 453 | #include <linux/slab.h> | ||
| 454 | #include <linux/pci.h> | 453 | #include <linux/pci.h> |
| 455 | #include <linux/eisa.h> | 454 | #include <linux/eisa.h> |
| 456 | #include <linux/delay.h> | 455 | #include <linux/delay.h> |
| @@ -467,6 +466,7 @@ | |||
| 467 | #include <linux/dma-mapping.h> | 466 | #include <linux/dma-mapping.h> |
| 468 | #include <linux/moduleparam.h> | 467 | #include <linux/moduleparam.h> |
| 469 | #include <linux/bitops.h> | 468 | #include <linux/bitops.h> |
| 469 | #include <linux/gfp.h> | ||
| 470 | 470 | ||
| 471 | #include <asm/io.h> | 471 | #include <asm/io.h> |
| 472 | #include <asm/dma.h> | 472 | #include <asm/dma.h> |