diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /drivers/net/phy/qsemi.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/net/phy/qsemi.c')
| -rw-r--r-- | drivers/net/phy/qsemi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/phy/qsemi.c b/drivers/net/phy/qsemi.c index d461ba457631..65d995b02b25 100644 --- a/drivers/net/phy/qsemi.c +++ b/drivers/net/phy/qsemi.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> |