---

yaml --- r: 190290 b: refs/heads/master c: 562468b h: refs/heads/master v: v3
git-mirror · Apr 23, 2010 · 9b280e0 · 9b280e0
1 parent 0652ae8
commit 9b280e0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8334810db6e74019048cb3fc17c5e0b4d0c8c68
+refs/heads/master: 562468bd697a88ad78a751823dc92f027f8c179c
diff --git a/trunk/arch/arm/plat-omap/include/plat/nand.h b/trunk/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