From patchwork Thu Aug 26 08:56:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mark F. Brown" X-Patchwork-Id: 63156 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5C1FCB70FC for ; Tue, 31 Aug 2010 12:15:10 +1000 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1OqGMU-0004am-Br; Tue, 31 Aug 2010 02:14:10 +0000 Received: from mail-qy0-f177.google.com ([209.85.216.177]) by bombadil.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1OqGMM-0004YD-62; Tue, 31 Aug 2010 02:14:02 +0000 Received: by mail-qy0-f177.google.com with SMTP id 8so6442056qyk.15 for ; Mon, 30 Aug 2010 19:14:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=+kBQOdSDx2fZnhT3Ml8oWwmx/nE9+1qXoxpNFkhAB6I=; b=TBYlKfqvHgUWpUkTa16vaEIgWgbdELlIh1A5BZ95duGZ7MjiyD+A/OavlE8u7oLpP0 RJ506oA8HOnfBV98cQTwW9z/4nqePyN/2b6mrPZyXuC0P7+WzYzXRQpVH6XIiEHYU3VW 6enXW4emq5yGHQOKx+N+4KGjiW5z9jyN/AT5Q= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=Q0MnzcEcNeA3Bsdfe7c538gP63ToM+3HV2JqVO+OKzfellEa7TBg4cifTtskNQVIEc RW9CjByeixU3hMQMlxkXlIjmNmEyaHA4dSQ7WkHK/8xoQQEsKuTgRV9hRDo0b1sOeHtZ hu1+0AfBYMkGfGE4Z2xcQAIKMckN/ppXYV06k= Received: by 10.224.36.204 with SMTP id u12mr3553920qad.134.1283220841819; Mon, 30 Aug 2010 19:14:01 -0700 (PDT) Received: from localhost.localdomain (pool-173-48-127-202.bstnma.fios.verizon.net [173.48.127.202]) by mx.google.com with ESMTPS id t4sm9129955qcs.4.2010.08.30.19.13.58 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 30 Aug 2010 19:14:00 -0700 (PDT) From: "Mark F. Brown" To: Eric Miao , Haojian Zhuang , "Mark F. Brown" , linux-arm-kernel , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: pxa3xx: fix build error when CONFIG_MTD_PARTITIONS is not defined Date: Thu, 26 Aug 2010 04:56:51 -0400 Message-Id: <1282813011-6187-2-git-send-email-mark.brown314@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1282813011-6187-1-git-send-email-mark.brown314@gmail.com> References: <1282813011-6187-1-git-send-email-mark.brown314@gmail.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20100830_221402_264857_C6D00E14 X-CRM114-Status: GOOD ( 12.32 ) X-Spam-Score: 4.2 (++++) X-Spam-Report: SpamAssassin version 3.3.1 on bombadil.infradead.org summary: Content analysis details: (4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.216.177 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is freemail (mark.brown314[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 2.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (mark.brown314[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: "Mark F. Brown" X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Mark F. Brown --- drivers/mtd/nand/pxa3xx_nand.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 4d89f37..4d01cda 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -1320,6 +1320,7 @@ static int pxa3xx_nand_probe(struct platform_device *pdev) goto fail_free_irq; } +#ifdef CONFIG_MTD_PARTITIONS if (mtd_has_cmdlinepart()) { static const char *probes[] = { "cmdlinepart", NULL }; struct mtd_partition *parts; @@ -1332,6 +1333,9 @@ static int pxa3xx_nand_probe(struct platform_device *pdev) } return add_mtd_partitions(mtd, pdata->parts, pdata->nr_parts); +#else + return 0; +#endif fail_free_irq: free_irq(irq, info); @@ -1364,7 +1368,9 @@ static int pxa3xx_nand_remove(struct platform_device *pdev) platform_set_drvdata(pdev, NULL); del_mtd_device(mtd); +#ifdef CONFIG_MTD_PARTITIONS del_mtd_partitions(mtd); +#endif irq = platform_get_irq(pdev, 0); if (irq >= 0) free_irq(irq, info);