Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40847437 authored by Andres Salomon's avatar Andres Salomon Committed by David Woodhouse
Browse files

mtd: fix build error in m25p80.c 



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: default avatarAndres Salomon <dilinger@queued.net>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 8cc9de3e

drivers/mtd/devices/m25p80.c

+1 −1
Original line number Diff line number Diff line
@@ -928,7 +928,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);