summaryrefslogtreecommitdiff
path: root/xpp
diff options
context:
space:
mode:
authortzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2007-08-21 16:49:31 +0000
committertzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2007-08-21 16:49:31 +0000
commit6f45603d448a3c3064f7543d67058eaeffddf456 (patch)
tree7c86ae2967801e6737f46bc6c1e3efb5f5d71607 /xpp
parent0179bfde2adccdcd734a49149d96f1ca3f212ddc (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 git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@2920 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp')
-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;
}