Merge branch 'master' into for-2.6.35

[linux-beck.git] / block / blk-cgroup.c

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 25cc7514d817ee8e714793011107c986e4bae133..aa97cd455cefa91400759968421ec71ed36b33af 100644 (file)
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/blkdev.h>
+#include <linux/slab.h>
 #include "blk-cgroup.h"
 #include <linux/genhd.h>