[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-head
Subject:    ARM: OMAP2+: nand: fix build error when CONFIG_MTD_ONENAND_OMAP2=n
From:       "Linux Kernel Mailing List" <linux-kernel () vger ! kernel ! org>
Date:       2012-06-30 23:28:41
Message-ID: 20120630232841.973A1340423 () ra ! kernel ! org
[Download RAW message or body]

Gitweb:     http://git.kernel.org/linus/;a=commit;h=bb44c30e53053c653302b53c8671c3c5ca62e881
                
Commit:     bb44c30e53053c653302b53c8671c3c5ca62e881
Parent:     6b16351acbd415e66ba16bf7d473ece1574cf0bc
Author:     Kevin Hilman <khilman@ti.com>
AuthorDate: Tue Jun 26 03:29:57 2012 -0700
Committer:  Tony Lindgren <tony@atomide.com>
CommitDate: Tue Jun 26 03:29:57 2012 -0700

    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 <eballetbo@gmail.com>
    Cc: Javier Martinez Canillas <javier@dowhile0.org>
    Signed-off-by: Kevin Hilman <khilman@ti.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/board-flash.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-omap2/board-flash.c b/arch/arm/mach-omap2/board-flash.c
index 70a81f9..53c39d2 100644
--- a/arch/arm/mach-omap2/board-flash.c
+++ b/arch/arm/mach-omap2/board-flash.c
@@ -97,11 +97,6 @@ __init board_onenand_init(struct mtd_partition *onenand_parts,
 
 	gpmc_onenand_init(&board_onenand_data);
 }
-#else
-void
-__init board_onenand_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs)
-{
-}
 #endif /* CONFIG_MTD_ONENAND_OMAP2 || CONFIG_MTD_ONENAND_OMAP2_MODULE */
 
 #if defined(CONFIG_MTD_NAND_OMAP2) || \
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[prev in list] [next in list] [prev in thread] [next in thread]