summaryrefslogtreecommitdiff
path: root/zttranscode.c
diff options
context:
space:
mode:
authorkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-01-25 23:59:37 +0000
committerkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-01-25 23:59:37 +0000
commit860c46060672ec32918b3ea305c2d3a795bb6ae7 (patch)
tree9aa987489d6775df2b010af0897110be89bd4d44 /zttranscode.c
parentd8e4f2d9d55628bdc758ffcdcf4321883770a721 (diff)
get this branch to build against 2.6.24 kernel build system (similar to r3706 from tzafrir for branch-1.4)
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@3741 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'zttranscode.c')
-rw-r--r--zttranscode.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/zttranscode.c b/zttranscode.c
index cf99b8a..ea3ac30 100644
--- a/zttranscode.c
+++ b/zttranscode.c
@@ -39,15 +39,12 @@
#ifdef CONFIG_DEVFS_FS
#include <linux/devfs_fs_kernel.h>
#endif
-#ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
-#else
-#include <linux/zaptel.h>
-#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
#endif
+#include "zaptel.h"
+
static int debug = 0;
static struct zt_transcoder *trans;
static spinlock_t translock = SPIN_LOCK_UNLOCKED;