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/myri_sbus.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/myri_sbus.c')
| -rw-r--r-- | drivers/net/myri_sbus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c index 8b4313085359..b72e749afdf1 100644 --- a/drivers/net/myri_sbus.c +++ b/drivers/net/myri_sbus.c | |||
| @@ -14,7 +14,6 @@ static char version[] = | |||
| 14 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
| 15 | #include <linux/ioport.h> | 15 | #include <linux/ioport.h> |
| 16 | #include <linux/in.h> | 16 | #include <linux/in.h> |
| 17 | #include <linux/slab.h> | ||
| 18 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 19 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| @@ -26,6 +25,7 @@ static char version[] = | |||
| 26 | #include <linux/of.h> | 25 | #include <linux/of.h> |
| 27 | #include <linux/of_device.h> | 26 | #include <linux/of_device.h> |
| 28 | #include <linux/firmware.h> | 27 | #include <linux/firmware.h> |
| 28 | #include <linux/gfp.h> | ||
| 29 | 29 | ||
| 30 | #include <net/dst.h> | 30 | #include <net/dst.h> |
| 31 | #include <net/arp.h> | 31 | #include <net/arp.h> |