diff options
author | Jamie Iles <jamie@jamieiles.com> | 2011-05-23 05:22:55 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2011-05-24 21:21:14 -0400 |
commit | 47854888cc21cb1afd7797c66886a8b06cf35979 (patch) | |
tree | f7064bb1517774bef809fa8df3287fd4a10b0a95 /arch/mips | |
parent | 5851becb5bae13ca6525fd0d97116043fcb0e20e (diff) |
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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c index 812816c45662..ec38e00b2559 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, | |||
639 | .flags = IORESOURCE_MEM, | 639 | .flags = IORESOURCE_MEM, |
640 | }; | 640 | }; |
641 | struct platform_device *pdev; | 641 | struct platform_device *pdev; |
642 | #ifdef CONFIG_MTD_PARTITIONS | ||
643 | static struct mtd_partition parts[2]; | 642 | static struct mtd_partition parts[2]; |
644 | struct physmap_flash_data pdata_part; | 643 | struct physmap_flash_data pdata_part; |
645 | 644 | ||
@@ -658,7 +657,7 @@ void __init txx9_physmap_flash_init(int no, unsigned long addr, | |||
658 | pdata_part.parts = parts; | 657 | pdata_part.parts = parts; |
659 | pdata = &pdata_part; | 658 | pdata = &pdata_part; |
660 | } | 659 | } |
661 | #endif | 660 | |
662 | pdev = platform_device_alloc("physmap-flash", no); | 661 | pdev = platform_device_alloc("physmap-flash", no); |
663 | if (!pdev || | 662 | if (!pdev || |
664 | platform_device_add_resources(pdev, &res, 1) || | 663 | platform_device_add_resources(pdev, &res, 1) || |