Prev: [RFC PATCH] init: boot to device-mapper targets without an initr*
Next: Linux 2.6.33.4
From: Peter Huewe on 12 May 2010 18:10
From: Peter Huewe <peterhuewe(a)gmx.de>

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(a)gmx.de>
---
KernelVersion: linux-next of 20100512
References:
[1] http://kisskb.ellerman.id.au/kisskb/buildresult/2601986/

include/linux/mtd/sh_flctl.h | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/linux/mtd/sh_flctl.h b/include/linux/mtd/sh_flctl.h
index 178b5c2..d7b686a 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__ */
--
1.6.4.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [RFC PATCH] init: boot to device-mapper targets without an initr*
Next: Linux 2.6.33.4