[zaptel-commits] tzafrir: trunk r2921 - in /trunk: ./ xpp/xbus-core.c

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Tue Aug 21 11:59:07 2007
New Revision: 2921

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2921
Log:
Fix building on kernel 2.6.23rc1, from Axel Thimm (xpp r4523).

Merged revisions 2919 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2
Merged revisions 2920 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.4

Modified:
    trunk/   (props changed)
    trunk/xpp/xbus-core.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/xpp/xbus-core.c
URL: http://svn.digium.com/view/zaptel/trunk/xpp/xbus-core.c?view=diff&rev=2921&r1=2920&r2=2921
==============================================================================
--- trunk/xpp/xbus-core.c (original)
+++ trunk/xpp/xbus-core.c Tue Aug 21 11:59:07 2007
@@ -1281,7 +1281,10 @@
 	xframes_cache = kmem_cache_create("xpp_frames",
 			sizeof(xframe_t) + XFRAME_DATASIZE,
 			0, 0,
-			NULL, NULL);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
+			NULL, 
+#endif
+			NULL);
 	if(!xframes_cache) {
 		return -ENOMEM;
 	}