diff --git a/[refs] b/[refs] index 4a962177fa54..ddbd42a49e0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77be4b1366c97b95bb197e18187ff45b0e4f6bd3 +refs/heads/master: c0931ef1f3e7305e55de1591602e5f25e4c11d1d diff --git a/trunk/include/linux/slab_def.h b/trunk/include/linux/slab_def.h index 0c634fa376c9..36d7031a1a53 100644 --- a/trunk/include/linux/slab_def.h +++ b/trunk/include/linux/slab_def.h @@ -45,7 +45,6 @@ struct kmem_cache { unsigned int colour_off; /* colour offset */ struct kmem_cache *slabp_cache; unsigned int slab_size; - unsigned int dflags; /* dynamic flags */ /* constructor func */ void (*ctor)(void *obj);