[zaptel-commits] sruffell: branch 1.4 r4549 - /branches/1.4/kernel/wctc4xxp/base.c

[SVN commits to the Zaptel project]

Author: sruffell
Date: Tue Sep 30 15:23:06 2008
New Revision: 4549

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4549
Log:
Removing reference to setup_timer on kernels before 2.6.18.

Modified:
    branches/1.4/kernel/wctc4xxp/base.c

Modified: branches/1.4/kernel/wctc4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wctc4xxp/base.c?view=diff&rev=4549&r1=4548&r2=4549
==============================================================================
--- branches/1.4/kernel/wctc4xxp/base.c (original)
+++ branches/1.4/kernel/wctc4xxp/base.c Tue Sep 30 15:23:06 2008
@@ -3035,7 +3035,14 @@
 		}
 	}
 
+
+#	if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+	wc->watchdog.function = wctc4xxp_watchdog;
+	wc->watchdog.data = (unsigned long)wc;
+	init_timer(&wc->watchdog);
+#	else
 	setup_timer(&wc->watchdog, wctc4xxp_watchdog, (unsigned long)wc); 
+#	endif
 
 	/* ------------------------------------------------------------------
 	 * Load the firmware and start the DTE.