* [PATCH] ARM: pxa3xx: fix build error when CONFIG_MTD_PARTITIONS is not defined
@ 2010-08-26 8:56 Mark F. Brown
2010-08-26 8:56 ` Mark F. Brown
0 siblings, 1 reply; 5+ messages in thread
From: Mark F. Brown @ 2010-08-26 8:56 UTC (permalink / raw)
To: linux-arm-kernel
If CONFIG_MTD_PARTITIONS is not defined for pxa3xx NAND driver it will display a build error:
drivers/built-in.o: In function `pxa3xx_nand_remove':
drivers/mtd/nand/pxa3xx_nand.c:1367: undefined reference to `del_mtd_partitions'
drivers/built-in.o: In function `pxa3xx_nand_probe':
drivers/mtd/nand/pxa3xx_nand.c:1334: undefined reference to `add_mtd_partitions'
make: *** [.tmp_vmlinux1] Error 1
Patched against Eric Miao's pxa tree
Mark F. Brown (1):
ARM: pxa3xx: fix build error when CONFIG_MTD_PARTITIONS is not
defined
drivers/mtd/nand/pxa3xx_nand.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH] ARM: pxa3xx: fix build error when CONFIG_MTD_PARTITIONS is not defined 2010-08-26 8:56 [PATCH] ARM: pxa3xx: fix build error when CONFIG_MTD_PARTITIONS is not defined Mark F. Brown @ 2010-08-26 8:56 ` Mark F. Brown 2010-08-31 5:51 ` Haojian Zhuang 2010-09-01 23:20 ` Artem Bityutskiy 0 siblings, 2 replies; 5+ messages in thread From: Mark F. Brown @ 2010-08-26 8:56 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Mark F. Brown <mark.brown314@gmail.com> --- 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); -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] ARM: pxa3xx: fix build error when CONFIG_MTD_PARTITIONS is not defined 2010-08-26 8:56 ` Mark F. Brown @ 2010-08-31 5:51 ` Haojian Zhuang 2010-08-31 23:31 ` Artem Bityutskiy 2010-09-01 23:20 ` Artem Bityutskiy 1 sibling, 1 reply; 5+ messages in thread From: Haojian Zhuang @ 2010-08-31 5:51 UTC (permalink / raw) To: linux-arm-kernel On Thu, Aug 26, 2010 at 4:56 PM, Mark F. Brown <mark.brown314@gmail.com> wrote: > Signed-off-by: Mark F. Brown <mark.brown314@gmail.com> > --- > ?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); > -- > 1.7.0.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at ?http://vger.kernel.org/majordomo-info.html > Please read the FAQ at ?http://www.tux.org/lkml/ > Hi Mark, Don't forget to cc maintainer of mtd tree. I loop them now. Thanks Haojian ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: pxa3xx: fix build error when CONFIG_MTD_PARTITIONS is not defined 2010-08-31 5:51 ` Haojian Zhuang @ 2010-08-31 23:31 ` Artem Bityutskiy 0 siblings, 0 replies; 5+ messages in thread From: Artem Bityutskiy @ 2010-08-31 23:31 UTC (permalink / raw) To: linux-arm-kernel On Tue, 2010-08-31 at 13:51 +0800, Haojian Zhuang wrote: > Hi Mark, > > Don't forget to cc maintainer of mtd tree. I loop them now. FYI, the MTD maintainer id dwmw2, I'm just helping him sometimes. -- Best Regards, Artem Bityutskiy (???????? ?????) ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: pxa3xx: fix build error when CONFIG_MTD_PARTITIONS is not defined 2010-08-26 8:56 ` Mark F. Brown 2010-08-31 5:51 ` Haojian Zhuang @ 2010-09-01 23:20 ` Artem Bityutskiy 1 sibling, 0 replies; 5+ messages in thread From: Artem Bityutskiy @ 2010-09-01 23:20 UTC (permalink / raw) To: linux-arm-kernel On Thu, 2010-08-26 at 04:56 -0400, Mark F. Brown wrote: > Signed-off-by: Mark F. Brown <mark.brown314@gmail.com> > --- > drivers/mtd/nand/pxa3xx_nand.c | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) Pushed to l2-mtd-2.6 / for-2.6.36, thanks. -- Best Regards, Artem Bityutskiy (???????? ?????) ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-09-01 23:20 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-08-26 8:56 [PATCH] ARM: pxa3xx: fix build error when CONFIG_MTD_PARTITIONS is not defined Mark F. Brown 2010-08-26 8:56 ` Mark F. Brown 2010-08-31 5:51 ` Haojian Zhuang 2010-08-31 23:31 ` Artem Bityutskiy 2010-09-01 23:20 ` Artem Bityutskiy
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).