From 737716d493b79c94f418b42ad2cfb78ff55595ef Mon Sep 17 00:00:00 2001 From: tzafrir Date: Tue, 21 Aug 2007 16:59:07 +0000 Subject: 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 git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2921 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- xpp/xbus-core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpp/xbus-core.c b/xpp/xbus-core.c index f88e2cd..5a9e5d4 100644 --- a/xpp/xbus-core.c +++ b/xpp/xbus-core.c @@ -1281,7 +1281,10 @@ int __init xbus_core_init(void) 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; } -- cgit v1.2.3