From c546dcd9e4d879936a67360e369f41578f57d4e2 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.com>
Date: Tue, 25 Nov 2008 15:08:19 +0100
Subject: [PATCH] --- yaml --- r: 123457 b: refs/heads/master c:
 dfcd3610289132a762b7dc0eaf33998262cd9e20 h: refs/heads/master i:   123455:
 683f9405c935d80a46364b20cd84c75734ee3906 v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/slab.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 766e31b5822f..b48333321253 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8759ec50a6cad7ca5a6d63e657d25b85ab5ba44a
+refs/heads/master: dfcd3610289132a762b7dc0eaf33998262cd9e20
diff --git a/trunk/include/linux/slab.h b/trunk/include/linux/slab.h
index 000da12b5cf0..9d8ca14be3c4 100644
--- a/trunk/include/linux/slab.h
+++ b/trunk/include/linux/slab.h
@@ -285,7 +285,7 @@ extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, void *);
 #define kmalloc_node_track_caller(size, flags, node) \
 	kmalloc_track_caller(size, flags)
 
-#endif /* DEBUG_SLAB */
+#endif /* CONFIG_NUMA */
 
 /*
  * Shortcuts