Merge branch 'next' into for-linus

[mv-sheeva.git] / include / linux / slab.h

diff --git a/include/linux/slab.h b/include/linux/slab.h
index fa9086647eb7aef52284006c575e716703bb17de..ad4dd1c8d30aadcdee4dec8d95524d77df7a74a3 100644 (file)
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -105,7 +105,6 @@ void kmem_cache_destroy(struct kmem_cache *);
 int kmem_cache_shrink(struct kmem_cache *);
 void kmem_cache_free(struct kmem_cache *, void *);
 unsigned int kmem_cache_size(struct kmem_cache *);
-const char *kmem_cache_name(struct kmem_cache *);
 
 /*
  * Please use this macro to create slab caches. Simply specify the