From badd0b7ef4970f753aeed6f1b4b0125044ea8ef7 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sat, 11 Feb 2012 15:11:41 +0000 Subject: [PATCH] ramips: rt288x: remove CONFIG_MTD_PARTITION ifdefery from machine files SVN-Revision: 30436 --- .../ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c | 4 ---- .../linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c | 4 ---- .../files/arch/mips/ralink/rt288x/mach-wli-tx4-ag300n.c | 4 ---- .../ramips/files/arch/mips/ralink/rt288x/mach-wzr-agl300nh.c | 4 ---- 4 files changed, 16 deletions(-) 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 db45cc87f2..71c84c1467 100644 --- 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 18d5337b9d..0818f2c233 100644 --- 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 0f200ea298..03c4adf31b 100644 --- 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 f77306daa9..3e59fbe13c 100644 --- 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) -- 2.30.2