aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/cafe_nand.c
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-06-02 10:51:15 -0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 08:01:57 -0400
commit2e7485f49984ad9cea2d039acfd0554217710cce (patch)
treec562bbe12f56b8f7519c5dfe547ad11f12b641e4 /drivers/mtd/nand/cafe_nand.c
parent13e0fe49f676607688da7475c33540ec5dac53b5 (diff)
mtd: cafe_nand: drop reference to CONFIG_MTD_CMDLINE_PARTS
There is no need to guard mtd->name with CONFIG_MTD_CMDLINE_PARTS as name can be used by other parts. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'drivers/mtd/nand/cafe_nand.c')
-rw-r--r--drivers/mtd/nand/cafe_nand.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
index d0eed498ed2b..88ac4b598abc 100644
--- a/drivers/mtd/nand/cafe_nand.c
+++ b/drivers/mtd/nand/cafe_nand.c
@@ -803,9 +803,7 @@ static int __devinit cafe_nand_probe(struct pci_dev *pdev,
803 /* We register the whole device first, separate from the partitions */ 803 /* We register the whole device first, separate from the partitions */
804 mtd_device_register(mtd, NULL, 0); 804 mtd_device_register(mtd, NULL, 0);
805 805
806#ifdef CONFIG_MTD_CMDLINE_PARTS
807 mtd->name = "cafe_nand"; 806 mtd->name = "cafe_nand";
808#endif
809 nr_parts = parse_mtd_partitions(mtd, part_probes, &parts, 0); 807 nr_parts = parse_mtd_partitions(mtd, part_probes, &parts, 0);
810 if (nr_parts > 0) { 808 if (nr_parts > 0) {
811 cafe->parts = parts; 809 cafe->parts = parts;