diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 11:04:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 11:04:01 -0500 |
| commit | 8cde0776ec1e86c270f65bf482f96288e6bf0023 (patch) | |
| tree | 6350a8d67bea7bcdcbd1705a54f1b8e409a28775 /drivers/net/phy/davicom.c | |
| parent | 2ed5e6d09e266bd2288d49aaaf240ed8c468c13c (diff) | |
| parent | b78612b796b0d6cdfba553d456eff008278830e3 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/phy/davicom.c')
| -rw-r--r-- | drivers/net/phy/davicom.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c index 6caf499fae32..5e9002e444c5 100644 --- a/drivers/net/phy/davicom.c +++ b/drivers/net/phy/davicom.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <linux/spinlock.h> | 29 | #include <linux/spinlock.h> |
| 30 | #include <linux/mm.h> | 30 | #include <linux/mm.h> |
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/version.h> | ||
| 33 | #include <linux/mii.h> | 32 | #include <linux/mii.h> |
| 34 | #include <linux/ethtool.h> | 33 | #include <linux/ethtool.h> |
| 35 | #include <linux/phy.h> | 34 | #include <linux/phy.h> |