projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
arm
/
mach-orion5x
/
wrt350n-v2-setup.c
diff --git
a/arch/arm/mach-orion5x/wrt350n-v2-setup.c
b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
index
61e9027
..
a6a8c46
100644
(file)
--- a/
arch/arm/mach-orion5x/wrt350n-v2-setup.c
+++ b/
arch/arm/mach-orion5x/wrt350n-v2-setup.c
@@
-191,7
+191,7
@@
static struct dsa_chip_data wrt350n_v2_switch_chip_data = {
.port_names[7] = "lan4",
};
.port_names[7] = "lan4",
};
-static struct dsa_platform_data wrt350n_v2_switch_plat_data = {
+static struct dsa_platform_data
__initdata
wrt350n_v2_switch_plat_data = {
.nr_chips = 1,
.chip = &wrt350n_v2_switch_chip_data,
};
.nr_chips = 1,
.chip = &wrt350n_v2_switch_chip_data,
};
@@
-210,7
+210,7
@@
static void __init wrt350n_v2_init(void)
*/
orion5x_ehci0_init();
orion5x_eth_init(&wrt350n_v2_eth_data);
*/
orion5x_ehci0_init();
orion5x_eth_init(&wrt350n_v2_eth_data);
- orion5x_eth_switch_init(&wrt350n_v2_switch_plat_data
, NO_IRQ
);
+ orion5x_eth_switch_init(&wrt350n_v2_switch_plat_data);
orion5x_uart0_init();
mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
orion5x_uart0_init();
mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,