JFFS2: Eliminate compiler error when both NAND and OneNAND are enabled.
Reported-by: Alessandro Rubini <rubini-list@gnudd.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
parent
c57fc28947
commit
2f77c7f45b
|
@ -449,20 +449,18 @@ static inline void *get_node_mem(u32 off)
|
||||||
|
|
||||||
static inline void put_fl_mem(void *buf)
|
static inline void put_fl_mem(void *buf)
|
||||||
{
|
{
|
||||||
#if defined(CONFIG_JFFS2_NAND) && \
|
|
||||||
defined(CONFIG_CMD_NAND)
|
|
||||||
struct mtdids *id = current_part->dev->id;
|
struct mtdids *id = current_part->dev->id;
|
||||||
|
|
||||||
if (id->type == MTD_DEV_TYPE_NAND)
|
switch (id->type) {
|
||||||
|
#if defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)
|
||||||
|
case MTD_DEV_TYPE_NAND:
|
||||||
return put_fl_mem_nand(buf);
|
return put_fl_mem_nand(buf);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_CMD_ONENAND)
|
#if defined(CONFIG_CMD_ONENAND)
|
||||||
struct mtdids *id = current_part->dev->id;
|
case MTD_DEV_TYPE_ONENAND:
|
||||||
|
|
||||||
if (id->type == MTD_DEV_TYPE_ONENAND)
|
|
||||||
return put_fl_mem_onenand(buf);
|
return put_fl_mem_onenand(buf);
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Compression names */
|
/* Compression names */
|
||||||
|
|
Loading…
Reference in New Issue