From 1e5de85bb473e7cd4cb8a68f23c404dcdab2cdc8 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 7 Dec 2009 19:29:39 +1100
Subject: [PATCH] --- yaml --- r: 173017 b: refs/heads/master c:
 accee7854b378a8ab5995d8f5dc5d8abc3b3d23a h: refs/heads/master i:   173015:
 d0e9b8542d4461405bb64601f1b7c4704bdfe251 v: v3

---
 [refs]                   | 2 +-
 trunk/block/blk-cgroup.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e4482a3d5974..431563e9d9ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb729bc98c0f3e6a898d8730df3e2830bf68751a
+refs/heads/master: accee7854b378a8ab5995d8f5dc5d8abc3b3d23a
diff --git a/trunk/block/blk-cgroup.c b/trunk/block/blk-cgroup.c
index 3ad497f4eed6..1fa2654db0a6 100644
--- a/trunk/block/blk-cgroup.c
+++ b/trunk/block/blk-cgroup.c
@@ -14,6 +14,7 @@
 #include <linux/seq_file.h>
 #include <linux/kdev_t.h>
 #include <linux/module.h>
+#include <linux/err.h>
 #include "blk-cgroup.h"
 
 static DEFINE_SPINLOCK(blkio_list_lock);