summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-flash.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-09-20 15:57:39 -0700
committerTony Lindgren <tony@atomide.com>2011-09-20 15:57:39 -0700
commitf8cf8e47fb87e3b27e63d36fc8d61b11273f37bc (patch)
tree8945f4cfc4c22e5c8c5f17c2bb7258be5a0f94e2 /arch/arm/mach-omap2/board-flash.h
parentceb1c532ba6220900e61ec7073a9234661efa450 (diff)
downloadop-kernel-dev-f8cf8e47fb87e3b27e63d36fc8d61b11273f37bc.zip
op-kernel-dev-f8cf8e47fb87e3b27e63d36fc8d61b11273f37bc.tar.gz
ARM: OMAP2+: Fix missing inline functions for Makefile cleanup
Commit f41caddbe73f52a42f529d668ce47b4d693fd2c0 (omap2+: Use Kconfig symbol in Makefile instead of obj-y) cleaned up the omap2+ Makefile. However this did not account for the inline functions that are now needed for board_flash_init and board_nand_init. Reported-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-flash.h')
-rw-r--r--arch/arm/mach-omap2/board-flash.h19
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-flash.h b/arch/arm/mach-omap2/board-flash.h
index c240a3f..d25503a 100644
--- a/arch/arm/mach-omap2/board-flash.h
+++ b/arch/arm/mach-omap2/board-flash.h
@@ -24,7 +24,26 @@ struct flash_partitions {
int nr_parts;
};
+#if defined(CONFIG_MTD_NAND_OMAP2) || \
+ defined(CONFIG_MTD_NAND_OMAP2_MODULE) || \
+ defined(CONFIG_MTD_ONENAND_OMAP2) || \
+ defined(CONFIG_MTD_ONENAND_OMAP2_MODULE)
extern void board_flash_init(struct flash_partitions [],
char chip_sel[][GPMC_CS_NUM], int nand_type);
+#else
+static inline void board_flash_init(struct flash_partitions part[],
+ char chip_sel[][GPMC_CS_NUM], int nand_type)
+{
+}
+#endif
+
+#if defined(CONFIG_MTD_NAND_OMAP2) || \
+ defined(CONFIG_MTD_NAND_OMAP2_MODULE)
extern void board_nand_init(struct mtd_partition *nand_parts,
u8 nr_parts, u8 cs, int nand_type);
+#else
+static inline void board_nand_init(struct mtd_partition *nand_parts,
+ u8 nr_parts, u8 cs, int nand_type)
+{
+}
+#endif
OpenPOWER on IntegriCloud