diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 11:51:24 +0100 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 11:51:24 +0100 |
commit | 3b621ee5df437d3f332a635ab6421aaa61a7dc2b (patch) | |
tree | c4a5236cee8eb7418770802313d36a55f1cc0b1e /drivers/telephony/ixj.h | |
parent | Merge branch 'master' (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
download | linux-3b621ee5df437d3f332a635ab6421aaa61a7dc2b.tar.xz linux-3b621ee5df437d3f332a635ab6421aaa61a7dc2b.zip |
Merge branch 'master'
Diffstat (limited to 'drivers/telephony/ixj.h')
-rw-r--r-- | drivers/telephony/ixj.h | 1 |
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> |