diff --git a/[refs] b/[refs]
index 3ab0c2cfd734..b20bb31e5793 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72f924f62a6eb375c7c237ecc911f95be0531d1a
+refs/heads/master: 2f5ea47712489a9d2d3cb832eb06062e4e64e0ec
diff --git a/trunk/block/blk-cgroup.h b/trunk/block/blk-cgroup.h
index b24ab71db826..257dc6a956b6 100644
--- a/trunk/block/blk-cgroup.h
+++ b/trunk/block/blk-cgroup.h
@@ -15,6 +15,8 @@
 
 #include <linux/cgroup.h>
 
+#ifdef CONFIG_BLK_CGROUP
+
 struct blkio_cgroup {
 	struct cgroup_subsys_state css;
 	unsigned int weight;
@@ -41,6 +43,13 @@ struct blkio_group {
 	unsigned long sectors;
 };
 
+#else
+
+struct blkio_group {
+};
+
+#endif
+
 #define BLKIO_WEIGHT_MIN	100
 #define BLKIO_WEIGHT_MAX	1000
 #define BLKIO_WEIGHT_DEFAULT	500
@@ -69,6 +78,7 @@ extern struct blkio_group *blkiocg_lookup_group(struct blkio_cgroup *blkcg,
 void blkiocg_update_blkio_group_stats(struct blkio_group *blkg,
 			unsigned long time, unsigned long sectors);
 #else
+struct cgroup;
 static inline struct blkio_cgroup *
 cgroup_to_blkio_cgroup(struct cgroup *cgroup) { return NULL; }