diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 08:04:01 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 08:04:01 -0800 |
commit | 8cde0776ec1e86c270f65bf482f96288e6bf0023 (patch) | |
tree | 6350a8d67bea7bcdcbd1705a54f1b8e409a28775 /drivers/net/phy/phy.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/phy.c')
-rw-r--r-- | drivers/net/phy/phy.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 9209da9dde0d..b8686e47f899 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -30,7 +30,6 @@ #include <linux/spinlock.h> #include <linux/mm.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/mii.h> #include <linux/ethtool.h> #include <linux/phy.h> |