diff --git a/[refs] b/[refs]
index 3d6f97f12724..e0e8dde4fa46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b92b5c41a05b69f56e3d5e92dce3dbb5f5f5cf81
+refs/heads/master: 67026418f534045525a7c39f506006cd7fbd197f
diff --git a/trunk/include/linux/mtd/sh_flctl.h b/trunk/include/linux/mtd/sh_flctl.h
index ab77609ec337..178b5c26c995 100644
--- a/trunk/include/linux/mtd/sh_flctl.h
+++ b/trunk/include/linux/mtd/sh_flctl.h
@@ -93,7 +93,10 @@
 #define INIT_FL4ECCRESULT_VAL	0x03FF03FF
 #define LOOP_TIMEOUT_MAX	0x00010000
 
-#define mtd_to_flctl(mtd)	container_of(mtd, struct sh_flctl, mtd)
+static inline struct sh_flctl *mtd_to_flctl(struct mtd_info *mtdinfo)
+{
+	return container_of(mtdinfo, struct sh_flctl, mtd);
+}
 
 struct sh_flctl {
 	struct mtd_info		mtd;