ramips: rt288x: remove CONFIG_MTD_PARTITION ifdefery from machine files

SVN-Revision: 30436

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c
index db45cc87f2a6b81de3f8e6f3102fa1db824fa45b..71c84c14671bce67c37f9c8ad696a709f710a50e 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c
@@ -37,7 +37,6 @@
 
 #define F5D8235_BUTTONS_POLL_INTERVAL  20
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition f5d8235_partitions[] = {
        {
                .name   = "uboot",
@@ -62,13 +61,10 @@ static struct mtd_partition f5d8235_partitions[] = {
                .size   = 0x010000,
        }
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data f5d8235_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
        .nr_parts       = ARRAY_SIZE(f5d8235_partitions),
        .parts          = f5d8235_partitions,
-#endif
 };
 
 static struct rtl8366_platform_data f5d8235_rtl8366s_data = {

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c
index 18d5337b9d517ccee9dd4d4acac2ab24d62ed585..0818f2c23316d7e89056321a42fc5cf453758ddb 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c
@@ -34,7 +34,6 @@
 
 #define RT_N15_BUTTONS_POLL_INTERVAL   20
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition rt_n15_partitions[] = {
        {
                .name   = "u-boot",
@@ -65,13 +64,10 @@ static struct mtd_partition rt_n15_partitions[] = {
                .size   = 0x3b0000,
        }
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data rt_n15_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
        .nr_parts       = ARRAY_SIZE(rt_n15_partitions),
        .parts          = rt_n15_partitions,
-#endif
 };
 
 static struct gpio_led rt_n15_leds_gpio[] __initdata = {

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-wli-tx4-ag300n.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-wli-tx4-ag300n.c
index 0f200ea298e33abf67c4355d1860c455cdaefd44..03c4adf31b882fc41e56cdf51f8b596750b9eba7 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-wli-tx4-ag300n.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-wli-tx4-ag300n.c
@@ -34,7 +34,6 @@
 
 #define WLI_TX4_AG300N_BUTTONS_POLL_INTERVAL   20
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition wli_tx4_ag300n_partitions[] = {
        {
                .name   = "u-boot",
@@ -75,13 +74,10 @@ static struct mtd_partition wli_tx4_ag300n_partitions[] = {
                .size   = 0x3a0000,
        },
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data wli_tx4_ag300n_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
        .nr_parts       = ARRAY_SIZE(wli_tx4_ag300n_partitions),
        .parts          = wli_tx4_ag300n_partitions,
-#endif
 };
 
 static struct gpio_led wli_tx4_ag300n_leds_gpio[] __initdata = {

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-wzr-agl300nh.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-wzr-agl300nh.c
index f77306daa98ee02330662d7c80b3efe73047676d..3e59fbe13c861d5afaef2a4f5fb95a2519830e3f 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-wzr-agl300nh.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-wzr-agl300nh.c
@@ -30,7 +30,6 @@
  * mtd5: 00010000 00010000 "user_property"
  */
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition wzr_agl300nh_partitions[] = {
        {
                .name   = "uboot",
@@ -61,13 +60,10 @@ static struct mtd_partition wzr_agl300nh_partitions[] = {
                .size   = 0x010000,
        }
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data wzr_agl300nh_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
        .nr_parts       = ARRAY_SIZE(wzr_agl300nh_partitions),
        .parts          = wzr_agl300nh_partitions,
-#endif
 };
 
 static void __init wzr_agl300nh_init(void)