projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-2.6-block.git]
/
arch
/
arm
/
mach-mvebu
/
kirkwood.c
diff --git
a/arch/arm/mach-mvebu/kirkwood.c
b/arch/arm/mach-mvebu/kirkwood.c
index a3f4029b25d712346fd18dcc43fd384a7c6b25f9..7d9f2fd9e450512ebd798eaa56ba6841b690fec4 100644
(file)
--- a/
arch/arm/mach-mvebu/kirkwood.c
+++ b/
arch/arm/mach-mvebu/kirkwood.c
@@
-179,7
+179,7
@@
static void __init kirkwood_dt_init(void)
kirkwood_pm_init();
kirkwood_dt_eth_fixup();
- of_platform_
populate(NULL, of_default_bus_match_table
, auxdata, NULL);
+ of_platform_
default_populate(NULL
, auxdata, NULL);
}
static const char * const kirkwood_dt_board_compat[] __initconst = {