From patchwork Thu Jan 8 00:06:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3/3, v2, MTD, NAND] pxa3xx_nand.c: Fix compilation without MTD partitioning support Date: Wed, 07 Jan 2009 14:06:40 -0000 From: Marcel Ziswiler X-Patchwork-Id: 17289 Message-Id: <1231373200-19248-4-git-send-email-marcel@ziswiler.com> To: linux-mtd@lists.infradead.org Cc: Marcel Ziswiler , eric.y.miao@gmail.com, Marcel Ziswiler , LW@KARO-electronics.de This fixes compilation without MTD partitioning support previously failing. Signed-off-by: Marcel Ziswiler --- drivers/mtd/nand/pxa3xx_nand.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 45122ab..04ba7be 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -1161,7 +1161,10 @@ static int pxa3xx_nand_probe(struct platform_device *pdev) goto fail_free_irq; } - return add_mtd_partitions(mtd, pdata->parts, pdata->nr_parts); +#ifdef CONFIG_MTD_PARTITIONS + ret = add_mtd_partitions(mtd, pdata->parts, pdata->nr_parts); +#endif + return ret; fail_free_irq: free_irq(IRQ_NAND, info); @@ -1192,7 +1195,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 free_irq(IRQ_NAND, info); if (use_dma) { pxa_free_dma(info->data_dma_ch);