Commit bb44c30e authored by Kevin Hilman's avatar Kevin Hilman Committed by Tony Lindgren

ARM: OMAP2+: nand: fix build error when CONFIG_MTD_ONENAND_OMAP2=n

commit 8259573b (ARM: OMAP2+: nand: Make board_onenand_init() visible
to board code) broke the build for configs with OneNAND disabled.  By
removing the static in the header file, it created a duplicate definition
in the .c and the .h files, resuling in a build error:

/work/kernel/omap/dev/arch/arm/mach-omap2/board-flash.c:102:111: error: redefinition of 'board_onenand_init'
/work/kernel/omap/dev/arch/arm/mach-omap2/board-flash.h:56:51: note: previous definition of 'board_onenand_init' was here
make[2]: *** [arch/arm/mach-omap2/board-flash.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [arch/arm/mach-omap2] Error 2
make: *** [sub-make] Error 2

Fix this by removing the duplicate dummy entry from the C file.

Cc: Enric Balletbò i Serra <>
Cc: Javier Martinez Canillas <>
Signed-off-by: default avatarKevin Hilman <>
Signed-off-by: default avatarTony Lindgren <>
parent 6b16351a
......@@ -97,11 +97,6 @@ __init board_onenand_init(struct mtd_partition *onenand_parts,
__init board_onenand_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs)
#if defined(CONFIG_MTD_NAND_OMAP2) || \
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment