ramips: rt305x: remove CONFIG_MTD_PARTITION ifdefery from machine files

[openwrt.git] / target / linux / ramips / files / arch / mips / ralink / rt305x / mach-nw718.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-nw718.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-nw718.c
index 9d2f47f..917357e 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-nw718.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-nw718.c
@@ -34,7 +34,6 @@
 
 #define NW718_BUTTONS_POLL_INTERVAL    20
 
 
 #define NW718_BUTTONS_POLL_INTERVAL    20
 

-#ifdef CONFIG_MTD_PARTITIONS

 static struct mtd_partition nw718_partitions[] = {
        {
                .name   = "u-boot",
 static struct mtd_partition nw718_partitions[] = {
        {
                .name   = "u-boot",


@@ -65,14 +64,9 @@ static struct mtd_partition nw718_partitions[] = {
                .size   = 0x3a0000,
        }
 };
                .size   = 0x3a0000,
        }
 };

-#define nw718_nr_parts         ARRAY_SIZE(nw718_partitions)
-#else
-#define nw718_nr_parts         0
-#define nw718_partitions       NULL
-#endif /* CONFIG_MTD_PARTITIONS */

 
 static struct flash_platform_data nw718_flash_data = {
 
 static struct flash_platform_data nw718_flash_data = {

-       .nr_parts       = nw718_nr_parts,
+       .nr_parts       = ARRAY_SIZE(nw718_partitions),

        .parts          = nw718_partitions,
 };
 
        .parts          = nw718_partitions,
 };