From 40c07f37d9e065d656e88603f8c8b60a86506a2b Mon Sep 17 00:00:00 2001 From: juhosg Date: Sun, 12 Feb 2012 12:52:10 +0000 Subject: ramips: rt305x: remove per-board physmap_flash_data instances git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30473 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c') 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 acef97807..cbbf73001 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 @@ -61,11 +61,6 @@ static struct mtd_partition v22rw_2x2_partitions[] = { } }; -static struct physmap_flash_data v22rw_2x2_flash_data = { - .nr_parts = ARRAY_SIZE(v22rw_2x2_partitions), - .parts = v22rw_2x2_partitions, -}; - static struct gpio_led v22rw_2x2_leds_gpio[] __initdata = { { .name = "v22rw-2x2:green:security", @@ -100,7 +95,10 @@ static void __init v22rw_2x2_init(void) { rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT); - rt305x_register_flash(0, &v22rw_2x2_flash_data); + rt305x_flash0_data.nr_parts = ARRAY_SIZE(v22rw_2x2_partitions); + rt305x_flash0_data.parts = v22rw_2x2_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(v22rw_2x2_leds_gpio), -- cgit v1.2.3