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/skfp | |
| 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/skfp')
| -rw-r--r-- | drivers/net/skfp/skfddi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c index 7e5b9f310fb2..7912606b0bc7 100644 --- a/drivers/net/skfp/skfddi.c +++ b/drivers/net/skfp/skfddi.c | |||
| @@ -78,13 +78,13 @@ static const char * const boot_msg = | |||
| 78 | #include <linux/kernel.h> | 78 | #include <linux/kernel.h> |
| 79 | #include <linux/errno.h> | 79 | #include <linux/errno.h> |
| 80 | #include <linux/ioport.h> | 80 | #include <linux/ioport.h> |
| 81 | #include <linux/slab.h> | ||
| 82 | #include <linux/interrupt.h> | 81 | #include <linux/interrupt.h> |
| 83 | #include <linux/pci.h> | 82 | #include <linux/pci.h> |
| 84 | #include <linux/netdevice.h> | 83 | #include <linux/netdevice.h> |
| 85 | #include <linux/fddidevice.h> | 84 | #include <linux/fddidevice.h> |
| 86 | #include <linux/skbuff.h> | 85 | #include <linux/skbuff.h> |
| 87 | #include <linux/bitops.h> | 86 | #include <linux/bitops.h> |
| 87 | #include <linux/gfp.h> | ||
| 88 | 88 | ||
| 89 | #include <asm/byteorder.h> | 89 | #include <asm/byteorder.h> |
| 90 | #include <asm/io.h> | 90 | #include <asm/io.h> |