diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-02-12 12:52:10 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-02-12 12:52:10 +0000 |
commit | 48d4c1988513010133c5316aca23ed87dbae6eb7 (patch) | |
tree | 1c8507121106408b0a255ee521ca6c1040631871 /target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c | |
parent | d976d07b419b80c7dd66a995fb74c39a26cc1dec (diff) | |
download | upstream-48d4c1988513010133c5316aca23ed87dbae6eb7.tar.gz upstream-48d4c1988513010133c5316aca23ed87dbae6eb7.tar.bz2 upstream-48d4c1988513010133c5316aca23ed87dbae6eb7.zip |
ramips: rt305x: remove per-board physmap_flash_data instances
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30473 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c')
-rw-r--r-- | target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c | 10 |
1 files changed, 4 insertions, 6 deletions
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 6d6dc7f60f..fdcd6b3204 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 @@ -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), |