diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-05-30 09:35:38 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-12-06 10:59:35 +0100 |
| commit | 0449ba2af5671d49556409404d265093ae397dc0 (patch) | |
| tree | ee9e0007b38c400a22ec5a52dd50833ebec7dec6 /sound | |
| parent | 015795f0b20808880fc57bb79de373b12cdca08c (diff) | |
sound: soc: ux500: Fix merge problems
Fix merge problems introduced in soc u8500 driver
when merging from main dev track
ST-Ericsson Linux next: 342252
ST-Ericsson ID: 342253
ST-Ericsson FOSS-OUT ID: Trivial
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Change-Id: I083638dddc34792b654d36b5aa967238614799c7
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24724
Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/ux500/u8500.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/soc/ux500/u8500.c b/sound/soc/ux500/u8500.c index 4172dcb1eb1..a0ced866def 100644 --- a/sound/soc/ux500/u8500.c +++ b/sound/soc/ux500/u8500.c @@ -166,6 +166,15 @@ static int __init u8500_soc_init(void) platform_device_register(&cg29xx_codec); #endif + #ifdef CONFIG_SND_SOC_UX500_AB8500 + pr_debug("%s: Calling init-function for AB8500 machine driver.\n", + __func__); + ret = ux500_ab8500_soc_machine_drv_init(); + if (ret) + pr_err("%s: ux500_ab8500_soc_machine_drv_init failed (%d).\n", + __func__, ret); + #endif + pr_debug("%s: Register device to generate a probe for Ux500-pcm platform.\n", __func__); platform_device_register(&ux500_pcm); |