diff options
author | Peter Huewe <peterhuewe@gmx.de> | 2010-05-12 18:06:54 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-12 18:24:23 -0400 |
commit | 1cd2620ca9332943c9fff84c0c9240982534d840 (patch) | |
tree | 9fb71b057f39ac2980023775c1c3ad6f5ad42fec /include/linux/mtd | |
parent | 0ae28a35bcb7984838acbf28bfba9c030f8b74f0 (diff) |
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/linux/mtd')
-rw-r--r-- | include/linux/mtd/sh_flctl.h | 10 |
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 @@ | |||
93 | #define INIT_FL4ECCRESULT_VAL 0x03FF03FF | 93 | #define INIT_FL4ECCRESULT_VAL 0x03FF03FF |
94 | #define LOOP_TIMEOUT_MAX 0x00010000 | 94 | #define LOOP_TIMEOUT_MAX 0x00010000 |
95 | 95 | ||
96 | static inline struct sh_flctl *mtd_to_flctl(struct mtd_info *mtdinfo) | ||
97 | { | ||
98 | return container_of(mtdinfo, struct sh_flctl, mtd); | ||
99 | } | ||
100 | |||
101 | struct sh_flctl { | 96 | struct sh_flctl { |
102 | struct mtd_info mtd; | 97 | struct mtd_info mtd; |
103 | struct nand_chip chip; | 98 | struct nand_chip chip; |
@@ -128,4 +123,9 @@ struct sh_flctl_platform_data { | |||
128 | unsigned has_hwecc:1; | 123 | unsigned has_hwecc:1; |
129 | }; | 124 | }; |
130 | 125 | ||
126 | static inline struct sh_flctl *mtd_to_flctl(struct mtd_info *mtdinfo) | ||
127 | { | ||
128 | return container_of(mtdinfo, struct sh_flctl, mtd); | ||
129 | } | ||
130 | |||
131 | #endif /* __SH_FLCTL_H__ */ | 131 | #endif /* __SH_FLCTL_H__ */ |