diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-07-23 01:26:02 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-07-23 01:26:02 -0700 |
| commit | 3965f5ba0489c01f419216c8909965b9a6a39388 (patch) | |
| tree | d2ef28248e014676cae80d0084a1c40557237bbd /arch/arm/mach-omap2/devices.c | |
| parent | ecf4c7938fe10aabdb962187719911d345bc20b1 (diff) | |
| parent | cbf14f3ab9bd6295b345fc812f08ddd844fb183e (diff) | |
Merge branch 'omap-for-v3.17/mailbox' into omap-for-v3.17/soc
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 592ba0a0ecf3..708eb7db630c 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -460,9 +460,9 @@ static int __init omap2_init_devices(void) omap_init_audio(); omap_init_camera(); omap_init_hdmi_audio(); - omap_init_mbox(); /* If dtb is there, the devices will be created dynamically */ if (!of_have_populated_dt()) { + omap_init_mbox(); omap_init_mcspi(); omap_init_sham(); omap_init_aes(); |