From: Gabor Juhos <juhosg@openwrt.org>
Date: Sat, 11 Feb 2012 15:11:43 +0000 (+0000)
Subject: ramips: rt305x: remove CONFIG_MTD_PARTITION ifdefery from machine files
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ba4c9b3a8faa8c553ce784f53962ff6b950b4891;p=openwrt%2Fstaging%2Fldir.git

ramips: rt305x: remove CONFIG_MTD_PARTITION ifdefery from machine files

SVN-Revision: 30437
---

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-all0256n.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-all0256n.c
index 297d9d29fa..3a53e16d07 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-all0256n.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-all0256n.c
@@ -30,7 +30,6 @@
 #define ALL0256N_GPIO_LED_RSSI_HIGH 13
 #define ALL0256N_BUTTONS_POLL_INTERVAL 20
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition all0256n_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -59,15 +58,11 @@ static struct mtd_partition all0256n_partitions[] = {
 		.size	= 0x3B0000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
-
 
 const struct flash_platform_data all0256n_flash = {
 	.type		= "mx25l3205d",
-#ifdef CONFIG_MTD_PARTITIONS
 	.parts		= all0256n_partitions,
 	.nr_parts	= ARRAY_SIZE(all0256n_partitions),
-#endif
 };
 
 struct spi_board_info all0256n_spi_slave_info[] __initdata = {
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-argus-atp52b.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-argus-atp52b.c
index be65690754..d1c5170293 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-argus-atp52b.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-argus-atp52b.c
@@ -61,7 +61,6 @@ static struct gpio_button argus_atp52b_gpio_buttons[] __initdata = {
 	}
 };
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition argus_atp52b_partitions[] = {
 	{
 		.name	= "bootloader",
@@ -88,13 +87,10 @@ static struct mtd_partition argus_atp52b_partitions[] = {
 		.size   = 0x690000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data argus_atp52b_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
 	.nr_parts	= ARRAY_SIZE(argus_atp52b_partitions),
 	.parts		= argus_atp52b_partitions,
-#endif
 };
 
 static void __init argus_atp52b_init(void)
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-bc2.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-bc2.c
index 21755cbdb7..bb225c1f1c 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-bc2.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-bc2.c
@@ -27,7 +27,6 @@
 
 #define BC2_BUTTONS_POLL_INTERVAL	20
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition bc2_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -58,13 +57,10 @@ static struct mtd_partition bc2_partitions[] = {
 		.size	= 0x7b0000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data bc2_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
 	.nr_parts	= ARRAY_SIZE(bc2_partitions),
 	.parts		= bc2_partitions,
-#endif
 };
 
 static struct gpio_led bc2_leds_gpio[] __initdata = {
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c
index 622803672a..70a2245b8d 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c
@@ -31,7 +31,6 @@
 
 #define DIR_300B_BUTTONS_POLL_INTERVAL	20
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition dir_300b_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -62,13 +61,10 @@ static struct mtd_partition dir_300b_partitions[] = {
 		.size	= 0x3b0000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data dir_300b_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
 	.nr_parts	= ARRAY_SIZE(dir_300b_partitions),
 	.parts		= dir_300b_partitions,
-#endif
 };
 
 static struct gpio_led dir_300b_leds_gpio[] __initdata = {
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-esr-9753.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-esr-9753.c
index 88043a01d7..fb3b7c8d66 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-esr-9753.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-esr-9753.c
@@ -30,7 +30,6 @@
 
 #define ESR_9753_BUTTONS_POLL_INTERVAL	20
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition esr_9753_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -61,13 +60,10 @@ static struct mtd_partition esr_9753_partitions[] = {
 		.size	= 0x3b0000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data esr_9753_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
 	.nr_parts	= ARRAY_SIZE(esr_9753_partitions),
 	.parts		= esr_9753_partitions,
-#endif
 };
 
 static struct gpio_led esr_9753_leds_gpio[] __initdata = {
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-f5d8235-v2.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-f5d8235-v2.c
index 0834c137d8..6b25c8c3e9 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-f5d8235-v2.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-f5d8235-v2.c
@@ -74,7 +74,6 @@ static struct gpio_led f5d8235v2_leds_gpio[] __initdata = {
 	}
 };
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition f5d8235v2_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -99,13 +98,10 @@ static struct mtd_partition f5d8235v2_partitions[] = {
 		.size	= 0x010000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data f5d8235v2_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
 	.nr_parts	= ARRAY_SIZE(f5d8235v2_partitions),
 	.parts		= f5d8235v2_partitions,
-#endif
 };
 
 
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-fonera20n.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-fonera20n.c
index e345092753..2157ca7a7c 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-fonera20n.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-fonera20n.c
@@ -31,7 +31,6 @@
 
 #define FONERA20N_BUTTONS_POLL_INTERVAL	20
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition fonera20n_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -62,13 +61,10 @@ static struct mtd_partition fonera20n_partitions[] = {
 		.size	= 0x7b0000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data fonera20n_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
 	.nr_parts	= ARRAY_SIZE(fonera20n_partitions),
 	.parts		= fonera20n_partitions,
-#endif
 };
 
 static struct gpio_led fonera20n_leds_gpio[] __initdata = {
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c
index 5a3114a051..21587812c4 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c
@@ -33,7 +33,6 @@
 
 #define HW550_3G_BUTTONS_POLL_INTERVAL	20
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition hw550_3g_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -64,13 +63,10 @@ static struct mtd_partition hw550_3g_partitions[] = {
 		.size	= 0x7b0000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data hw550_3g_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
 	.nr_parts	= ARRAY_SIZE(hw550_3g_partitions),
 	.parts		= hw550_3g_partitions,
-#endif
 };
 
 static struct gpio_led hw550_3g_leds_gpio[] __initdata = {
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-mofi3500-3gn.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-mofi3500-3gn.c
index 309d784500..e3273ba70e 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-mofi3500-3gn.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-mofi3500-3gn.c
@@ -33,7 +33,6 @@
 
 #define MOFI3500_3GN_BUTTONS_POLL_INTERVAL	20
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition mofi3500_3gn_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -64,13 +63,10 @@ static struct mtd_partition mofi3500_3gn_partitions[] = {
 		.size	= 0x7b0000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data mofi3500_3gn_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
 	.nr_parts	= ARRAY_SIZE(mofi3500_3gn_partitions),
 	.parts		= mofi3500_3gn_partitions,
-#endif
 };
 
 static struct gpio_led mofi3500_3gn_leds_gpio[] __initdata = {
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-nbg-419n.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-nbg-419n.c
index 422765423d..63071da656 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-nbg-419n.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-nbg-419n.c
@@ -30,7 +30,6 @@
 
 #define NBG_419N_BUTTONS_POLL_INTERVAL	20
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition nbg_419n_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -53,13 +52,10 @@ static struct mtd_partition nbg_419n_partitions[] = {
 		.size	= 0x3b0000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data nbg_419n_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
 	.nr_parts	= ARRAY_SIZE(nbg_419n_partitions),
 	.parts		= nbg_419n_partitions,
-#endif
 };
 
 static struct gpio_led nbg_419n_leds_gpio[] __initdata = {
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 9d2f47f9de..917357ec12 100644
--- 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
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition nw718_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -65,14 +64,9 @@ static struct mtd_partition nw718_partitions[] = {
 		.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 = {
-	.nr_parts	= nw718_nr_parts,
+	.nr_parts	= ARRAY_SIZE(nw718_partitions),
 	.parts		= nw718_partitions,
 };
 
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-omni-emb.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-omni-emb.c
index 9fb4cd2ff6..a6c1a163a3 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-omni-emb.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-omni-emb.c
@@ -30,7 +30,6 @@
 #define OMNI_EMB_GPIO_LED_STATUS	9
 #define OMNI_EMB_GPIO_LED_WLAN		14
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition emb_partitions[] = {
 	{
 		.name	= "uboot",
@@ -60,13 +59,10 @@ static struct mtd_partition emb_partitions[] = {
 		.size	= 0x7B0000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data omni_emb_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
 	.nr_parts	= ARRAY_SIZE(emb_partitions),
 	.parts		= emb_partitions,
-#endif
 };
 
 static struct gpio_led omni_emb_leds_gpio[] __initdata = {
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-pwh2004.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-pwh2004.c
index c321e11088..4eb1f4b99e 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-pwh2004.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-pwh2004.c
@@ -27,7 +27,6 @@
 #define PWH2004_GPIO_LED_WIFI		14
 #define PWH2004_BUTTONS_POLL_INTERVAL	20
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition pwh2004_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -54,13 +53,10 @@ static struct mtd_partition pwh2004_partitions[] = {
 		.size	= 0x7b0000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data pwh2004_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
 	.nr_parts	= ARRAY_SIZE(pwh2004_partitions),
 	.parts		= pwh2004_partitions,
-#endif
 };
 
 static struct gpio_led pwh2004_leds_gpio[] __initdata = {
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-rt-g32-revb.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-rt-g32-revb.c
index 274466c210..6963c1744e 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-rt-g32-revb.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-rt-g32-revb.c
@@ -27,7 +27,6 @@
 
 #define RT_G32B_BUTTONS_POLL_INTERVAL	20
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition rt_g32b_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -58,14 +57,11 @@ static struct mtd_partition rt_g32b_partitions[] = {
 		.size	= 0x3b0000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 const struct flash_platform_data rt_g32b_flash = {
 	.type		= "mx25l3205d",
-#ifdef CONFIG_MTD_PARTITIONS
 	.parts		= rt_g32b_partitions,
 	.nr_parts	= ARRAY_SIZE(rt_g32b_partitions),
-#endif
 };
 
 struct spi_board_info __initdata rt_g32b_spi_slave_info[] = {
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c
index 44ebd06d52..6dee249440 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c
@@ -29,7 +29,6 @@
 
 #define V22RW_2X2_BUTTONS_POLL_INTERVAL	20
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition v22rw_2x2_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -60,13 +59,10 @@ static struct mtd_partition v22rw_2x2_partitions[] = {
 		.size	= 0x3b0000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data v22rw_2x2_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
 	.nr_parts	= ARRAY_SIZE(v22rw_2x2_partitions),
 	.parts		= v22rw_2x2_partitions,
-#endif
 };
 
 static struct gpio_led v22rw_2x2_leds_gpio[] __initdata = {
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-w502u.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-w502u.c
index c90884cac1..b214026595 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-w502u.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-w502u.c
@@ -30,7 +30,6 @@
 
 #define W502U_BUTTONS_POLL_INTERVAL	20
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition w502u_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -66,13 +65,10 @@ static struct mtd_partition w502u_partitions[] = {
 		.size	= 0x7a0000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data w502u_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
 	.nr_parts	= ARRAY_SIZE(w502u_partitions),
 	.parts		= w502u_partitions,
-#endif
 };
 
 static struct gpio_led w502u_leds_gpio[] __initdata = {
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wcr150gn.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wcr150gn.c
index 0da27359b1..8e3ed733a2 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wcr150gn.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wcr150gn.c
@@ -60,7 +60,6 @@ static struct gpio_button wcr150gn_gpio_buttons[] __initdata = {
 	}
 };
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition wcr150gn_partitions[] = {
 	{
 		.name	= "bootloader",
@@ -91,7 +90,6 @@ static struct mtd_partition wcr150gn_partitions[] = {
 		.size   = 0x3b0000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data wcr150gn_flash_data = {
 #ifdef CONFIG_MTD_PARTITIONS
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c
index 49ab0fd009..394c45acca 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c
@@ -33,7 +33,6 @@
 
 #define WHR_G300N_BUTTONS_POLL_INTERVAL		20
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition whr_g300n_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -68,13 +67,10 @@ static struct mtd_partition whr_g300n_partitions[] = {
 		.size	= 0x3a0000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data whr_g300n_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
 	.nr_parts	= ARRAY_SIZE(whr_g300n_partitions),
 	.parts		= whr_g300n_partitions,
-#endif
 };
 
 static struct gpio_led whr_g300n_leds_gpio[] __initdata = {
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wl341v3.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wl341v3.c
index 9341be3bee..a3c4485584 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wl341v3.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wl341v3.c
@@ -35,7 +35,6 @@
 
 #define WL341V3_BUTTONS_POLL_INTERVAL	20
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition wl341v3_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -74,13 +73,10 @@ static struct mtd_partition wl341v3_partitions[] = {
 		.size	= 0x400000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data wl341v3_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
 	.nr_parts	= ARRAY_SIZE(wl341v3_partitions),
 	.parts		= wl341v3_partitions,
-#endif
 };
 
 static struct gpio_led wl341v3_leds_gpio[] __initdata = {
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wl351.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wl351.c
index 3ebc7fee8b..ff2a1c2e56 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wl351.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wl351.c
@@ -69,8 +69,6 @@ static struct gpio_button wl351_gpio_buttons[] __initdata = {
 	}
 };
 
-
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition wl351_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -105,13 +103,10 @@ static struct mtd_partition wl351_partitions[] = {
 		.size	= 0x3a0000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data wl351_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
 	.nr_parts	= ARRAY_SIZE(wl351_partitions),
 	.parts		= wl351_partitions,
-#endif
 };
 
 
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr512-3gn.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr512-3gn.c
index 52b3cde2b4..d49a243622 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr512-3gn.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr512-3gn.c
@@ -44,8 +44,6 @@
 
 #define WR512_3GN_BUTTONS_POLL_INTERVAL	20
 
-#ifdef CONFIG_MTD_PARTITIONS
-
 static struct mtd_partition wr512_3gn_partitions[] = {
 	{
 		.name	= "u-boot",
@@ -77,13 +75,9 @@ static struct mtd_partition wr512_3gn_partitions[] = {
 	}
 };
 
-#endif /* CONFIG_MTD_PARTITIONS */
-
 static struct physmap_flash_data wr512_3gn_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
 	.nr_parts	= ARRAY_SIZE(wr512_3gn_partitions),
 	.parts		= wr512_3gn_partitions,
-#endif
 };
 
 static struct gpio_led wr512_3gn_leds_gpio[] __initdata = {
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr6202.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr6202.c
index 64ea20113c..9609b18285 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr6202.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr6202.c
@@ -33,7 +33,6 @@
 #define WR6202_GPIO_LED_3G	     13
 #define WR6202_GPIO_LED_WPS	     14
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition wr6202_partitions[] = {
 	{
 		.name	= "uboot",
@@ -59,13 +58,10 @@ static struct mtd_partition wr6202_partitions[] = {
 		.size	= 0x6B0000,
 	}
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data wr6202_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
 	.nr_parts	= ARRAY_SIZE(wr6202_partitions),
 	.parts		= wr6202_partitions,
-#endif
 };
 
 static struct gpio_led wr6202_leds_gpio[] __initdata = {