From ec8e7a9c340ba72cb8d951941263e7bfa1bafe78 Mon Sep 17 00:00:00 2001 From: Robert Marklund Date: Mon, 30 May 2011 09:35:38 +0200 Subject: 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 Change-Id: I083638dddc34792b654d36b5aa967238614799c7 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24724 Reviewed-by: Philippe LANGLAIS --- sound/soc/ux500/u8500.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'sound') 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); -- cgit v1.2.3