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/3c505.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/3c505.c')
| -rw-r--r-- | drivers/net/3c505.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c index 81c8b31e629f..8d584f5fd02d 100644 --- a/drivers/net/3c505.c +++ b/drivers/net/3c505.c | |||
| @@ -102,12 +102,12 @@ | |||
| 102 | #include <linux/interrupt.h> | 102 | #include <linux/interrupt.h> |
| 103 | #include <linux/errno.h> | 103 | #include <linux/errno.h> |
| 104 | #include <linux/in.h> | 104 | #include <linux/in.h> |
| 105 | #include <linux/slab.h> | ||
| 106 | #include <linux/ioport.h> | 105 | #include <linux/ioport.h> |
| 107 | #include <linux/spinlock.h> | 106 | #include <linux/spinlock.h> |
| 108 | #include <linux/ethtool.h> | 107 | #include <linux/ethtool.h> |
| 109 | #include <linux/delay.h> | 108 | #include <linux/delay.h> |
| 110 | #include <linux/bitops.h> | 109 | #include <linux/bitops.h> |
| 110 | #include <linux/gfp.h> | ||
| 111 | 111 | ||
| 112 | #include <asm/uaccess.h> | 112 | #include <asm/uaccess.h> |
| 113 | #include <asm/io.h> | 113 | #include <asm/io.h> |