From patchwork Fri Oct 26 01:48:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2,06/14] mtd: onenand: omap: use pdata info instead of cpu_is From: Paul Walmsley X-Patchwork-Id: 194333 Message-Id: To: Afzal Mohammed , Tony Lindgren Cc: Artem Bityutskiy , linux-mtd@lists.infradead.org, Jon Hunter , Ivan Djelic , linux-omap@vger.kernel.org, David Woodhouse , linux-arm-kernel@lists.infradead.org Date: Fri, 26 Oct 2012 01:48:44 +0000 (UTC) Hi Afzal On Mon, 8 Oct 2012, Afzal Mohammed wrote: > platform data now contains a field to indicate whether > soc belongs to omap34xx family, use it instead of > cpu_is_* check. > > This helps in removing dependency of platform specific > header file - cpu.h > > Signed-off-by: Afzal Mohammed This one breaks an N800 multi-OMAP build here: LD init/built-in.o drivers/built-in.o: In function `omap2_onenand_probe': /home/paul/linux-bisect/drivers/mtd/onenand/omap2.c:788: undefined reference to `omap3_onenand_read_bufferram' /home/paul/linux-bisect/drivers/mtd/onenand/omap2.c:788: undefined reference to `omap3_onenand_write_bufferram' make: *** [vmlinux] Error 1 A fix is below. - Paul --- drivers/mtd/onenand/omap2.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c index 53069ae..f87cf39 100644 --- a/drivers/mtd/onenand/omap2.c +++ b/drivers/mtd/onenand/omap2.c @@ -445,13 +445,19 @@ out_copy: #else -int omap3_onenand_read_bufferram(struct mtd_info *mtd, int area, - unsigned char *buffer, int offset, - size_t count); +static int omap3_onenand_read_bufferram(struct mtd_info *mtd, int area, + unsigned char *buffer, int offset, + size_t count) +{ + return -ENOSYS; +} -int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area, - const unsigned char *buffer, - int offset, size_t count); +static int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area, + const unsigned char *buffer, + int offset, size_t count) +{ + return -ENOSYS; +} #endif