[svn-commits] sruffell: linux/trunk r5017 - /linux/trunk/drivers/dahdi/wctc4xxp/base.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Sep 30 15:29:59 2008
New Revision: 5017

URL: http://svn.digium.com/view/dahdi?view=rev&rev=5017
Log:
Removing references to setup_timer in pre 2.6.18 kernels.

Modified:
    linux/trunk/drivers/dahdi/wctc4xxp/base.c

Modified: linux/trunk/drivers/dahdi/wctc4xxp/base.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wctc4xxp/base.c?view=diff&rev=5017&r1=5016&r2=5017
==============================================================================
--- linux/trunk/drivers/dahdi/wctc4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctc4xxp/base.c Tue Sep 30 15:29:59 2008
@@ -3035,7 +3035,13 @@
 		}
 	}
 
+#	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.