summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2007-08-21 16:59:07 +0000
committertzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2007-08-21 16:59:07 +0000
commit737716d493b79c94f418b42ad2cfb78ff55595ef (patch)
treed6da38ca99b8932692379007f74093b10d6ffb98
parent849780145babe6a7d4e17e7550f3d8461fb86d19 (diff)
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
-rw-r--r--xpp/xbus-core.c5
1 files changed, 4 insertions, 1 deletions
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;
}