Hi David,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/mtd/nand/r852.o: In function `.sm_sector_valid':
(.text+0x5c70): multiple definition of `.sm_sector_valid'
drivers/mtd/nand/sm_common.o:(.text+0x3c8): first defined here
drivers/mtd/nand/r852.o: In function `.sm_block_erased':
(.text+0x50dc): multiple definition of `.sm_block_erased'
drivers/mtd/nand/sm_common.o:(.text+0x2bc): first defined here
drivers/mtd/nand/r852.o: In function `.sm_block_valid':
(.text+0x5be8): multiple definition of `.sm_block_valid'
drivers/mtd/nand/sm_common.o:(.text+0x340): first defined here
Caused by commit 9fc51a37a8da84618df7584cad67c078317f6720 ("mtd: common
module for smartmedia/xD support") from the mtd tree.
I applied the following patch for today.
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 1 Mar 2010 20:44:57 +1100
Subject: [PATCH] mtd: declare inline functions static
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/mtd/nand/sm_common.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/nand/sm_common.h b/drivers/mtd/nand/sm_common.h
index 7c03314..18284f5 100644
--- a/drivers/mtd/nand/sm_common.h
+++ b/drivers/mtd/nand/sm_common.h
@@ -39,17 +39,17 @@ struct sm_oob {
extern int sm_register_device(struct mtd_info *mtd);
-inline int sm_sector_valid(struct sm_oob *oob)
+static inline int sm_sector_valid(struct sm_oob *oob)
{
return hweight16(oob->data_status) >= 5;
}
-inline int sm_block_valid(struct sm_oob *oob)
+static inline int sm_block_valid(struct sm_oob *oob)
{
return hweight16(oob->block_status) >= 7;
}
-inline int sm_block_erased(struct sm_oob *oob)
+static inline int sm_block_erased(struct sm_oob *oob)
{
static const uint32_t erased_pattern[4] = {
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF };
--
1.7.0
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
