From patchwork Fri Jul 27 12:38:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 10312 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 DB67223E23 for ; Fri, 27 Jul 2012 12:39:13 +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 AA4A9A1912D for ; Fri, 27 Jul 2012 12:39:13 +0000 (UTC) Received: by mail-gh0-f180.google.com with SMTP id z12so3098255ghb.11 for ; Fri, 27 Jul 2012 05:39:13 -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=hIePJBSCioLmrySqb1rubCAT+vxX75EynXRjpcDGu4DQf0PsPeHZ2ZzwH5WA7ecQ+2 uf1LNM7FzSeWr0/yqA0tUc0638hT273JIxlVstEFxGKdHod+sIomw+nMIsM9rkjlIoHV ZJxCKno+POEAYKkAqunCp/Yq9fuTTqSgtVVSKTndySUzSUaIb7tL6Fg8tCI13XMcX2Ye vk6YrxISyVbwmPXu7qUo4b8CEgD+dWDKA5+bR+yFQBobNk3k44Z7XxPbu76LX1CpRJRq jNFrsY53SgeYWTs3rOxhjXNhxz0QQV3xkrAQm4ssa4UQJiPCetqYb/EOibcvh2hIK15j R4Sw== Received: by 10.42.189.73 with SMTP id dd9mr1409536icb.49.1343392753294; Fri, 27 Jul 2012 05:39:13 -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.43.93.3 with SMTP id bs3csp29412icc; Fri, 27 Jul 2012 05:39:12 -0700 (PDT) Received: by 10.180.19.169 with SMTP id g9mr21915382wie.9.1343392752134; Fri, 27 Jul 2012 05:39:12 -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 p20si4926844wiv.37.2012.07.27.05.39.11 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 Jul 2012 05:39:12 -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 ds11so2659267wgb.31 for ; Fri, 27 Jul 2012 05:39:11 -0700 (PDT) Received: by 10.180.78.99 with SMTP id a3mr21880857wix.15.1343392751540; Fri, 27 Jul 2012 05:39:11 -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 ef5sm6242502wib.3.2012.07.27.05.39.10 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 Jul 2012 05:39:10 -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, sameo@linux.intel.com, alsa-devel@alsa-project.org, broonie@opensource.wolfsonmicro.com, lrg@ti.com, Lee Jones Subject: [PATCH 6/7] ARM: ux500: Fix merge error, so such struct 'snd_soc_u8500' Date: Fri, 27 Jul 2012 13:38:53 +0100 Message-Id: <1343392734-11805-7-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343392734-11805-1-git-send-email-lee.jones@linaro.org> References: <1343392734-11805-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkNC7Xj2RiRsjws37sv79JMgDr06S31dB83SL/hXfuK1f17Ynu8tjEc17iaNPsmz25bHdNy 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,