From patchwork Tue Jul 31 14:45:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 10429 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 4809324027 for ; Tue, 31 Jul 2012 14:53:36 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 112AFA188B5 for ; Tue, 31 Jul 2012 14:53:35 +0000 (UTC) Received: by yhpp61 with SMTP id p61so6019535yhp.11 for ; Tue, 31 Jul 2012 07:53:35 -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=GH0WvYKqXqxLSs0WTryCwxEoeiZd4vrauLVJsImHlox4A4grArORyxgKF3RzvcBWlT lXYUoVuET/bKRIkINU6qEKbD2v7kIYEALCVSe5x2D0N9QnhBBvWL/NsHgI2eJTukllfV PLd4sYM/8VYmxQhZ/l548sHHZeshF6jITATG2ZAmC6uD2oU4HnVvOrVjzCp9Ppd1tRS0 a5pCl94NjvBkNjkZzbl8YGAZj5iQpLmugexXN5DhxYHnPIkM9+viCXckuGbUZcI07XsG ezb+LP/16hcM16QiGVAAH+OcdverkLfiPrUYpZly3cdR7geB7We7rLCgk1dHpHM+zvJX oLrQ== Received: by 10.50.163.5 with SMTP id ye5mr913855igb.51.1343746415060; Tue, 31 Jul 2012 07:53:35 -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 u8csp148355igz; Tue, 31 Jul 2012 07:53:33 -0700 (PDT) Received: by 10.180.76.36 with SMTP id h4mr2902865wiw.13.1343745968643; Tue, 31 Jul 2012 07:46:08 -0700 (PDT) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id q3si23240592wiz.28.2012.07.31.07.46.07 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 31 Jul 2012 07:46:08 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by weyu7 with SMTP id u7so5300192wey.37 for ; Tue, 31 Jul 2012 07:46:07 -0700 (PDT) Received: by 10.180.104.197 with SMTP id gg5mr7517916wib.9.1343745967164; Tue, 31 Jul 2012 07:46:07 -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 j6sm695412wiy.4.2012.07.31.07.46.05 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 31 Jul 2012 07:46:06 -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, Lee Jones Subject: [PATCH 4/5] ARM: ux500: Fix merge error, so such struct 'snd_soc_u8500' Date: Tue, 31 Jul 2012 15:45:43 +0100 Message-Id: <1343745944-18418-5-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343745944-18418-1-git-send-email-lee.jones@linaro.org> References: <1343745944-18418-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkEE6JOFlt+WFRaKj9T/uf9cgtdF5Ll0PG74qUDD9Io7GqEOCiefOsCavlB0j18/bS8l7+c 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,