diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 14:24:41 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 14:24:41 +1100 |
commit | e9657304d0171ad723ad03d4dbdae592c8f3a969 (patch) | |
tree | 746e25a8d56f63e60bbc8dbfd4f9e1c9f80d28ae /include | |
parent | 3b5dd1f2e6af3bde24a82a7c78ec955741b87931 (diff) | |
parent | 852a905242e1ec8a20ab12659a2a5285320e4927 (diff) |
Merge remote-tracking branch 'slab/for-next'
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/slab.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h index fa9086647eb7..ad4dd1c8d30a 100644 --- 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 |