summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorstanley.miao <stanley.miao@windriver.com>2010-04-20 06:33:26 +0000
committerTony Lindgren <tony@atomide.com>2010-04-23 15:35:11 -0700
commit562468bd697a88ad78a751823dc92f027f8c179c (patch)
tree663f18f08a672b2738fbe03e13854ad86d23d5af /arch
parentc8334810db6e74019048cb3fc17c5e0b4d0c8c68 (diff)
downloadop-kernel-dev-562468bd697a88ad78a751823dc92f027f8c179c.zip
op-kernel-dev-562468bd697a88ad78a751823dc92f027f8c179c.tar.gz
omap: fix the compile error if CONFIG_MTD_NAND_OMAP2 is notenabled
If CONFIG_MTD_NAND_OMAP2 is not enabled, there will be a compile error, "gpmc_nand_init() is not defined". Add a inline noop function to fix it. Signed-off-by: Stanley.Miao <stanley.miao@windriver.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-omap/include/plat/nand.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/nand.h b/arch/arm/plat-omap/include/plat/nand.h
index 6ba88d2..f8efd546 100644
--- a/arch/arm/plat-omap/include/plat/nand.h
+++ b/arch/arm/plat-omap/include/plat/nand.h
@@ -29,4 +29,11 @@ struct omap_nand_platform_data {
/* size (4 KiB) for IO mapping */
#define NAND_IO_SIZE SZ_4K
+#if defined(CONFIG_MTD_NAND_OMAP2) || defined(CONFIG_MTD_NAND_OMAP2_MODULE)
extern int gpmc_nand_init(struct omap_nand_platform_data *d);
+#else
+static inline int gpmc_nand_init(struct omap_nand_platform_data *d)
+{
+ return 0;
+}
+#endif
OpenPOWER on IntegriCloud