summaryrefslogtreecommitdiffstats
path: root/drivers/telephony/ixj.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-11 11:51:24 +0100
committerJeff Garzik <jgarzik@pobox.com>2005-11-11 11:51:24 +0100
commit3b621ee5df437d3f332a635ab6421aaa61a7dc2b (patch)
treec4a5236cee8eb7418770802313d36a55f1cc0b1e /drivers/telephony/ixj.h
parentMerge branch 'master' (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff)
downloadlinux-3b621ee5df437d3f332a635ab6421aaa61a7dc2b.tar.xz
linux-3b621ee5df437d3f332a635ab6421aaa61a7dc2b.zip
Merge branch 'master'
Diffstat (limited to 'drivers/telephony/ixj.h')
-rw-r--r--drivers/telephony/ixj.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/telephony/ixj.h b/drivers/telephony/ixj.h
index 51e3f7f6597b..fbea4541c234 100644
--- 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>