OSDN Git Service

mips: tx99: remove CONFIG_MTD_PARTITIONS check
authorJamie Iles <jamie@jamieiles.com>
Mon, 23 May 2011 09:22:55 +0000 (10:22 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 25 May 2011 01:21:14 +0000 (02:21 +0100)
CONFIG_MTD_PARTITIONS no longer exists as MTD partitioning is always
enabled now.

Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
arch/mips/txx9/generic/setup.c

index 812816c..ec38e00 100644 (file)
@@ -639,7 +639,6 @@ void __init txx9_physmap_flash_init(int no, unsigned long addr,
                .flags = IORESOURCE_MEM,
        };
        struct platform_device *pdev;
-#ifdef CONFIG_MTD_PARTITIONS
        static struct mtd_partition parts[2];
        struct physmap_flash_data pdata_part;
 
@@ -658,7 +657,7 @@ void __init txx9_physmap_flash_init(int no, unsigned long addr,
                pdata_part.parts = parts;
                pdata = &pdata_part;
        }
-#endif
+
        pdev = platform_device_alloc("physmap-flash", no);
        if (!pdev ||
            platform_device_add_resources(pdev, &res, 1) ||