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/spider_net.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/spider_net.c')
| -rw-r--r-- | drivers/net/spider_net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index c04c8f9a2d96..3dff280b438b 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/if_vlan.h> | 31 | #include <linux/if_vlan.h> |
| 32 | #include <linux/in.h> | 32 | #include <linux/in.h> |
| 33 | #include <linux/init.h> | 33 | #include <linux/init.h> |
| 34 | #include <linux/gfp.h> | ||
| 34 | #include <linux/ioport.h> | 35 | #include <linux/ioport.h> |
| 35 | #include <linux/ip.h> | 36 | #include <linux/ip.h> |
| 36 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
| @@ -40,7 +41,6 @@ | |||
| 40 | #include <linux/device.h> | 41 | #include <linux/device.h> |
| 41 | #include <linux/pci.h> | 42 | #include <linux/pci.h> |
| 42 | #include <linux/skbuff.h> | 43 | #include <linux/skbuff.h> |
| 43 | #include <linux/slab.h> | ||
| 44 | #include <linux/tcp.h> | 44 | #include <linux/tcp.h> |
| 45 | #include <linux/types.h> | 45 | #include <linux/types.h> |
| 46 | #include <linux/vmalloc.h> | 46 | #include <linux/vmalloc.h> |