From 860c46060672ec32918b3ea305c2d3a795bb6ae7 Mon Sep 17 00:00:00 2001
From: kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>
Date: Fri, 25 Jan 2008 23:59:37 +0000
Subject: 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
---
 torisa.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'torisa.c')

diff --git a/torisa.c b/torisa.c
index 7027407..755d6de 100644
--- a/torisa.c
+++ b/torisa.c
@@ -31,17 +31,13 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <asm/io.h>
-#ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
-#include "torisa.h"
-#else
-#include <linux/zaptel.h>
-#include <linux/torisa.h>
-#endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>
 #endif
 
+#include "zaptel.h"
+#include "torisa.h"
+
 /* Board address offsets (specified in word (not byte) offsets) */
 #define	DDATA 0			/* Data I/O Register */
 #define	DADDR 0x100		/* Dallas Card Address Reg., 0x200 in byte offset higher */
-- 
cgit v1.2.3