Merge master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6] / drivers / telephony / ixj.h

diff --git a/drivers/telephony/ixj.h b/drivers/telephony/ixj.h
index 51e3f7f6597b2dfba83ecc26bb23dbe95408e43c..fbea4541c234bbcd4a83b9cdb4ddf75141e36aa2 100644 (file)
--- a/drivers/telephony/ixj.h
+++ b/drivers/telephony/ixj.h
@@ -40,7 +40,6 @@
  *****************************************************************************/
 #define IXJ_VERSION 3031
 
-#include <linux/version.h>
 #include <linux/types.h>
 
 #include <linux/ixjuser.h>