diff options
author | Jyri Sarha | 2013-05-14 17:31:34 -0500 |
---|---|---|
committer | Dan Murphy | 2013-06-07 07:37:05 -0500 |
commit | f3cb62a800ae37f17a3382b10d155ee02dbc83fc (patch) | |
tree | 39b0a290a03d77db76995e3842aae611a74b862c /arch | |
parent | e7460f2acdea5c9b766c7eb76bad5ab2ed7e566c (diff) | |
download | kernel-audio-f3cb62a800ae37f17a3382b10d155ee02dbc83fc.tar.gz kernel-audio-f3cb62a800ae37f17a3382b10d155ee02dbc83fc.tar.xz kernel-audio-f3cb62a800ae37f17a3382b10d155ee02dbc83fc.zip |
TI-Integration: ARM: OMAP2+: Fix merege by restoring omap_mcasp_init() call
Restore omap_mcasp_init() call that was lost in 1b891dcc-merge. McASP
device needs to be present for ABE TWL6040 probe to complete.
Signed-off-by: Jyri Sarha <jsarha@ti.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 20ccfff7ecc5..2d4f9c02dccf 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
@@ -690,6 +690,7 @@ static int __init omap2_init_devices(void) | |||
690 | omap_init_dmic(); | 690 | omap_init_dmic(); |
691 | omap_init_mcpdm(); | 691 | omap_init_mcpdm(); |
692 | omap_init_mcspi(); | 692 | omap_init_mcspi(); |
693 | omap_init_mcasp(); | ||
693 | omap_init_sham(); | 694 | omap_init_sham(); |
694 | omap_init_aes(); | 695 | omap_init_aes(); |
695 | } | 696 | } |