X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8aeb0454068e88ea3b7383411e5131e169f053d0..0dad89e259fbc5115631b0cfa54ea512eb411121:/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-f5d8235-v2.c

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 0834c137d..6bcca6024 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,15 +98,6 @@ 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
-};
-
 
 static struct rtl8366_platform_data f5d8235v2_switch_data = {
 	.gpio_sda	= RT305X_GPIO_I2C_SD,
@@ -129,7 +119,11 @@ static void __init f5d8235v2_init(void)
 					RT305X_GPIO_MODE_I2C |
 					RT305X_GPIO_MODE_SPI |
 					RT305X_GPIO_MODE_MDIO);
-	rt305x_register_flash(0, &f5d8235v2_flash_data);
+
+	rt305x_flash0_data.nr_parts = ARRAY_SIZE(f5d8235v2_partitions);
+	rt305x_flash0_data.parts = f5d8235v2_partitions;
+	rt305x_register_flash(0);
+
 	ramips_register_gpio_leds(-1, ARRAY_SIZE(f5d8235v2_leds_gpio),
 						f5d8235v2_leds_gpio);
 	rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_NONE;