diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-23 03:05:14 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-23 03:05:14 -0400 |
| commit | 7bece8155be133cd67c41eed2b31c60a310609de (patch) | |
| tree | 906a62dcf10c1f2e6c1188a2b6e386668fcd9fe3 /drivers/net/bfin_mac.c | |
| parent | b9a2f2e450b0f770bb4347ae8d48eb2dea701e24 (diff) | |
| parent | bdefff1f54cb76a19700663f211350de2f65cc91 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/bfin_mac.c')
| -rw-r--r-- | drivers/net/bfin_mac.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c index 89c0018132ec..41443435ab1c 100644 --- a/drivers/net/bfin_mac.c +++ b/drivers/net/bfin_mac.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <linux/crc32.h> | 22 | #include <linux/crc32.h> |
| 23 | #include <linux/device.h> | 23 | #include <linux/device.h> |
| 24 | #include <linux/spinlock.h> | 24 | #include <linux/spinlock.h> |
| 25 | #include <linux/ethtool.h> | ||
| 26 | #include <linux/mii.h> | 25 | #include <linux/mii.h> |
| 27 | #include <linux/phy.h> | 26 | #include <linux/phy.h> |
| 28 | #include <linux/netdevice.h> | 27 | #include <linux/netdevice.h> |