Re: mtd: fix build error in m25p80.c

From: Grant Likely
Date: Sat Oct 30 2010 - 01:57:50 EST


On Fri, Oct 29, 2010 at 09:04:19PM -0700, Andres Salomon wrote:
>
> While building an x86 distro kernel, I hit the following:
>
> Kernel: arch/x86/boot/bzImage is ready (#7)
> ERROR: "of_mtd_parse_partitions" [drivers/mtd/devices/m25p80.ko]
> undefined!
>
> of_mtd_parse_partitions is defined with MTD_OF_PARTS, and that's only
> built on PPC and microblaze. The code in question should be wrapped w/
> a stricter #ifdef.
>
> Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
> ---
> drivers/mtd/devices/m25p80.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
> index ea22520..184ddd5 100644
> --- a/drivers/mtd/devices/m25p80.c
> +++ b/drivers/mtd/devices/m25p80.c
> @@ -924,7 +924,7 @@ static int __devinit m25p_probe(struct spi_device *spi)
> nr_parts = data->nr_parts;
> }
>
> -#ifdef CONFIG_OF
> +#ifdef CONFIG_MTD_OF_PARTS
> if (nr_parts <= 0 && spi->dev.of_node) {
> nr_parts = of_mtd_parse_partitions(&spi->dev,
> spi->dev.of_node, &parts);

True; but CONFIG_MTD_OF_PARTS should be built on all architectures
when CONFIG_OF & CONFIG_MTD_PARTITIONS is set. I'll craft a patch.

g.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/