From patchwork Tue Apr 20 06:33:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "stanley.miao" X-Patchwork-Id: 93609 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3K6SWZY022069 for ; Tue, 20 Apr 2010 06:31:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753541Ab0DTGYl (ORCPT ); Tue, 20 Apr 2010 02:24:41 -0400 Received: from mail.windriver.com ([147.11.1.11]:55697 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753343Ab0DTGYl (ORCPT ); Tue, 20 Apr 2010 02:24:41 -0400 Received: from ALA-MAIL03.corp.ad.wrs.com (ala-mail03 [147.11.57.144]) by mail.windriver.com (8.14.3/8.14.3) with ESMTP id o3K6OaSP013057; Mon, 19 Apr 2010 23:24:36 -0700 (PDT) Received: from ala-mail06.corp.ad.wrs.com ([147.11.57.147]) by ALA-MAIL03.corp.ad.wrs.com with Microsoft SMTPSVC(6.0.3790.1830); Mon, 19 Apr 2010 23:24:36 -0700 Received: from localhost.localdomain ([128.224.163.169]) by ala-mail06.corp.ad.wrs.com with Microsoft SMTPSVC(6.0.3790.1830); Mon, 19 Apr 2010 23:24:35 -0700 From: "Stanley.Miao" To: linux-omap@vger.kernel.org Cc: tony@atomide.com, hvaibhav@ti.com, srk@ti.com, anuj.aggarwal@ti.com Subject: [PATCH 1/7] omap: fix the compile error if CONFIG_MTD_NAND_OMAP2 is not enabled Date: Tue, 20 Apr 2010 14:33:26 +0800 Message-Id: <1271745212-4474-2-git-send-email-stanley.miao@windriver.com> X-Mailer: git-send-email 1.5.6.3 In-Reply-To: <1271745212-4474-1-git-send-email-stanley.miao@windriver.com> References: <1271745212-4474-1-git-send-email-stanley.miao@windriver.com> X-OriginalArrivalTime: 20 Apr 2010 06:24:35.0633 (UTC) FILETIME=[259AEA10:01CAE052] Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 20 Apr 2010 06:31:23 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/plat/nand.h b/arch/arm/plat-omap/include/plat/nand.h index 6ba88d2..f8efd54 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