ramips: rt305x: remove per-board physmap_flash_data instances

[openwrt/svn-archive/archive.git] / target / linux / ramips / files / arch / mips / ralink / rt305x / mach-whr-g300n.c

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 6d6dc7f60fb1c4db5af004b466a5a6920e600ddd..fdcd6b320474cb9cbe4dbb45059293c907091e39 100644 (file)
--- 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
@@ -69,11 +69,6 @@ static struct mtd_partition whr_g300n_partitions[] = {
        }
 };
 
-static struct physmap_flash_data whr_g300n_flash_data = {
-       .nr_parts       = ARRAY_SIZE(whr_g300n_partitions),
-       .parts          = whr_g300n_partitions,
-};
-
 static struct gpio_led whr_g300n_leds_gpio[] __initdata = {
        {
                .name           = "whr-g300n:red:diag",
@@ -126,7 +121,10 @@ static void __init whr_g300n_init(void)
 {
        rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
 
-       rt305x_register_flash(0, &whr_g300n_flash_data);
+       rt305x_flash0_data.nr_parts = ARRAY_SIZE(whr_g300n_partitions);
+       rt305x_flash0_data.parts = whr_g300n_partitions;
+       rt305x_register_flash(0);
+
        rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_LLLLW;
        rt305x_register_ethernet();
        ramips_register_gpio_leds(-1, ARRAY_SIZE(whr_g300n_leds_gpio),