summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPeter Huewe <peterhuewe@gmx.de>2010-05-13 00:06:54 +0200
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-05-13 00:24:23 +0200
commit1cd2620ca9332943c9fff84c0c9240982534d840 (patch)
tree9fb71b057f39ac2980023775c1c3ad6f5ad42fec /include
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff)
downloadlinux-1cd2620ca9332943c9fff84c0c9240982534d840.tar.xz
linux-1cd2620ca9332943c9fff84c0c9240982534d840.zip
mtd/nand/sh_flctl: Move function mtd_to_flctl to fix build failure
This patch fixes a build failure[1] by simply moving the function mtd_to_flctl beneath the definition of sh_flctl which it uses. BF introduced by patch 'mtd/nand/sh_flctl: Replace the dangerous mtd_to_flctl macro' (67026418) Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/mtd/sh_flctl.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/mtd/sh_flctl.h b/include/linux/mtd/sh_flctl.h
index 178b5c26c995..9cf4c4c79555 100644
--- a/include/linux/mtd/sh_flctl.h
+++ b/include/linux/mtd/sh_flctl.h
@@ -93,11 +93,6 @@
#define INIT_FL4ECCRESULT_VAL 0x03FF03FF
#define LOOP_TIMEOUT_MAX 0x00010000
-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;
struct nand_chip chip;
@@ -128,4 +123,9 @@ struct sh_flctl_platform_data {
unsigned has_hwecc:1;
};
+static inline struct sh_flctl *mtd_to_flctl(struct mtd_info *mtdinfo)
+{
+ return container_of(mtdinfo, struct sh_flctl, mtd);
+}
+
#endif /* __SH_FLCTL_H__ */