[PATCH 3/4] omap: move detection of NAND CS to common-board-devices
From: Oleg Drokin <hidden>
Date: 2011-05-04 03:12:30
Also in:
linux-omap
Hello! This patch breaks compile for me: On Apr 24, 2011, at 6:09 PM, Mike Rapoport wrote:
quoted hunk ↗ jump to hunk
--- a/arch/arm/mach-omap2/common-board-devices.c +++ b/arch/arm/mach-omap2/common-board-devices.c@@ -29,6 +29,7 @@
...
+void __init omap_nand_flash_init(int options, struct mtd_partition *parts,
+ int nr_parts)
+{...
quoted hunk ↗ jump to hunk
+}diff --git a/arch/arm/mach-omap2/common-board-devices.h b/arch/arm/mach-omap2/common-board-devices.h index 0ec3e07..ca03abf 100644 --- a/arch/arm/mach-omap2/common-board-devices.h +++ b/arch/arm/mach-omap2/common-board-devices.h@@ -39,4 +40,13 @@ static inline void omap_ads7846_init(int bus_num,} #endif +#if defined(CONFIG_MTD_NAND_OMAP2) || defined(CONFIG_MTD_NAND_OMAP2_MODULE) +void omap_nand_flash_init(int opts, struct mtd_partition *parts, int n_parts); +#else +static inline void omap_nand_flash_init(int opts, struct mtd_partition *parts, + int nr_parts) +{ +}
arch/arm/mach-omap2/common-board-devices.c:113: error: redefinition of 'omap_nand_flash_init'
arch/arm/mach-omap2/common-board-devices.h:46: note: previous definition of 'omap_nand_flash_init' was here
I don't have CONFIG_MTD_NAND_OMAP2 defined of course as there is no NAND flash on my board.
Bye,
Oleg