Merge master.kernel.org:/pub/scm/linux/kernel/git/bunk/trivial

[linux-2.6] / drivers / net / phy / qsemi.c

diff --git a/drivers/net/phy/qsemi.c b/drivers/net/phy/qsemi.c
index d461ba457631eff23113691484fcfcc3db2f8766..65d995b02b25249d1fcdc18f6e3dd3c636c27266 100644 (file)
--- a/drivers/net/phy/qsemi.c
+++ b/drivers/net/phy/qsemi.c
@@ -29,7 +29,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>