[svn-commits] kpfleming: linux/trunk r4804 - /linux/trunk/drivers/dahdi/dahdi_dynamic.c

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Wed Aug 20 16:35:13 2008
New Revision: 4804

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4804
Log:
update code to match version in Zaptel

Modified:
    linux/trunk/drivers/dahdi/dahdi_dynamic.c

Modified: linux/trunk/drivers/dahdi/dahdi_dynamic.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/dahdi_dynamic.c?view=diff&rev=4804&r1=4803&r2=4804
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi_dynamic.c (original)
+++ linux/trunk/drivers/dahdi/dahdi_dynamic.c Wed Aug 20 16:35:13 2008
@@ -621,11 +621,17 @@
 	spin_lock_irqsave(&dlock, flags);
 	ztd = find_driver(zds->driver);
 	if (!ztd) {
-		/* Try loading the right module */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,70)
 		char fn[80];
+#endif
+
 		spin_unlock_irqrestore(&dlock, flags);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70)
+		request_module("dahdi_dynamic_%s", zds->driver);
+#else
 		sprintf(fn, "dahdi_dynamic_%s", zds->driver);
 		request_module(fn);
+#endif
 		spin_lock_irqsave(&dlock, flags);
 		ztd = find_driver(zds->driver);
 	}