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-imx
/
mach-imx6q.c
diff --git
a/arch/arm/mach-imx/mach-imx6q.c
b/arch/arm/mach-imx/mach-imx6q.c
index b31890f1e4a43b55f549f22a818a53fdce3388cd..68c16d59b808f986b9041f894cd9fcd6639cc4df 100644
(file)
--- a/
arch/arm/mach-imx/mach-imx6q.c
+++ b/
arch/arm/mach-imx/mach-imx6q.c
@@
-278,7
+278,7
@@
static void __init imx6q_init_machine(void)
imx6q_enet_phy_init();
- of_platform_
populate(NULL, of_default_bus_match_table
, NULL, parent);
+ of_platform_
default_populate(NULL
, NULL, parent);
imx_anatop_init();
cpu_is_imx6q() ? imx6q_pm_init() : imx6dl_pm_init();