summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-05-23 10:22:55 +0100
committerDavid Woodhouse <David.Woodhouse@intel.com>2011-05-25 02:21:14 +0100
commit47854888cc21cb1afd7797c66886a8b06cf35979 (patch)
treef7064bb1517774bef809fa8df3287fd4a10b0a95 /arch/mips
parent5851becb5bae13ca6525fd0d97116043fcb0e20e (diff)
downloadop-kernel-dev-47854888cc21cb1afd7797c66886a8b06cf35979.zip
op-kernel-dev-47854888cc21cb1afd7797c66886a8b06cf35979.tar.gz
mips: tx99: remove CONFIG_MTD_PARTITIONS check
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>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/txx9/generic/setup.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index 812816c..ec38e00 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -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) ||
OpenPOWER on IntegriCloud