diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2009-08-13 20:25:16 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2009-08-13 20:25:16 +0000 |
| commit | e12e4475e2e1643d3d11d6ddf1c20b67fa0b9cde (patch) | |
| tree | ff103b34904dba75dc3bbb140f136d6b94bcebfc /drivers/dahdi/xpp/xpp_usb.c | |
| parent | 1141298f5b26577313d4f327bdb30f6bbfb7ec79 (diff) | |
xpp: Only define SLAB_STORE_USER on 2.6.22 if CONFIG_SLUB is set.
Prevents a crash on 2.6.22 when CONFIG_SLAB is set and CONFIG_SLAB_DEBUG is
not.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@6995 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/xpp/xpp_usb.c')
| -rw-r--r-- | drivers/dahdi/xpp/xpp_usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dahdi/xpp/xpp_usb.c b/drivers/dahdi/xpp/xpp_usb.c index 36a4616..d69c99d 100644 --- a/drivers/dahdi/xpp/xpp_usb.c +++ b/drivers/dahdi/xpp/xpp_usb.c @@ -975,7 +975,7 @@ static int __init xpp_usb_init(void) INFO("revision %s\n", XPP_VERSION); xusb_cache = kmem_cache_create("xusb_cache", sizeof(xframe_t) + XFRAME_DATASIZE, -#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,22) +#if (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,22)) && defined(CONFIG_SLUB) 0, SLAB_STORE_USER, #else 0, 0, |