From patchwork Tue Jul 31 13:31:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 10399 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 98B1C23E56 for ; Tue, 31 Jul 2012 13:31:53 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 68904A187E6 for ; Tue, 31 Jul 2012 13:31:53 +0000 (UTC) Received: by ghbz12 with SMTP id z12so5873737ghb.11 for ; Tue, 31 Jul 2012 06:31:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=xwnInLAekNuEkDhuJYoWs41NjXn0uwNZRRCq7ug/aWM=; b=J5tK6Sc9mq4TFNaKUg/VE+PV5w12Bkisy3LC9TkFnXgaQjPU5bMlwPALc+6efT9Z0N ZfURCCTMOXqqaOf2DZ4D8RaXW80EUMVcYEyb/v4S/LTzcVwTBFYdbJX/9dxx3h+plxo+ qs2WZrMAccf92ZoTq5F20BKGahqRpiy6Zgu0gSWzMKrLtLa+WTK1QR8qBJY/CFghfO0n T97Z02eJ3VrthcgNOYPlZEuVgPTsAlQXMmm4xAGeNyYb4Nl/mKpck3+jbgRKlFVNfHpf DcqnrSsJcCzj/kexJR2Og4omxrpqwVheLjTGSdl/wf2+3iRcfd7OLqn2KA7eyNVrVcLm IkrA== Received: by 10.50.46.132 with SMTP id v4mr1988435igm.25.1343741512355; Tue, 31 Jul 2012 06:31:52 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.87.40 with SMTP id u8csp143093igz; Tue, 31 Jul 2012 06:31:51 -0700 (PDT) Received: by 10.216.95.10 with SMTP id o10mr7715205wef.213.1343741511130; Tue, 31 Jul 2012 06:31:51 -0700 (PDT) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id v61si92268wek.98.2012.07.31.06.31.50 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 31 Jul 2012 06:31:51 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by wgbds11 with SMTP id ds11so5598308wgb.31 for ; Tue, 31 Jul 2012 06:31:50 -0700 (PDT) Received: by 10.217.6.14 with SMTP id x14mr5618660wes.174.1343741510463; Tue, 31 Jul 2012 06:31:50 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id ex20sm263310wid.7.2012.07.31.06.31.49 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 31 Jul 2012 06:31:49 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: STEricsson_nomadik_linux@list.st.com, linus.walleij@stericsson.com, arnd@arndb.de, olalilja@yahoo.se, ola.o.lilja@stericsson.com, alsa-devel@alsa-project.org, broonie@opensource.wolfsonmicro.com, lrg@ti.com, Lee Jones Subject: [PATCH 3/6] ARM: ux500: Fix merge error, so such struct 'snd_soc_u8500' Date: Tue, 31 Jul 2012 14:31:26 +0100 Message-Id: <1343741493-17671-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343741493-17671-1-git-send-email-lee.jones@linaro.org> References: <1343741493-17671-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkWyWIOhNOefomcz5n9r3cQbBmJ9+IzOBz8DtObMiR3+DrrN5i6hFboDc5ikrncv8RqRo8k The platform attempts to register platform device 'snd_soc_u8500' which doesn't actually exist. Here we change the reference to the correct one 'snd_soc_mop500'. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500-msp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c index 9960480..1b6a193 100644 --- a/arch/arm/mach-ux500/board-mop500-msp.c +++ b/arch/arm/mach-ux500/board-mop500-msp.c @@ -228,7 +228,7 @@ int mop500_msp_init(struct device *parent) struct platform_device *msp1; pr_info("%s: Register platform-device 'snd-soc-u8500'.\n", __func__); - platform_device_register(&snd_soc_u8500); + platform_device_register(&snd_soc_mop500); pr_info("Initialize MSP I2S-devices.\n"); db8500_add_msp_i2s(parent, 0, U8500_MSP0_BASE, IRQ_DB8500_MSP0,