Manual merge with Linus.

[linux-2.6] / drivers / net / sk_mca.h

diff --git a/drivers/net/sk_mca.h b/drivers/net/sk_mca.h
index 7e7c995827460831f4200c139d98ffaff9bd4f31..d6fa1823dfa625973867c49703785fea944dda39 100644 (file)
--- a/drivers/net/sk_mca.h
+++ b/drivers/net/sk_mca.h
@@ -1,5 +1,3 @@
-#include <linux/version.h>
-
 #ifndef _SK_MCA_INCLUDE_
 #define _SK_MCA_INCLUDE_