From patchwork Tue Jul 31 13:31:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 1260011 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 009E2DF26F for ; Tue, 31 Jul 2012 13:51:05 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SwCjs-0008Qb-2P; Tue, 31 Jul 2012 13:43:56 +0000 Received: from mail-wg0-f49.google.com ([74.125.82.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SwCYn-0007YZ-8I for linux-arm-kernel@lists.infradead.org; Tue, 31 Jul 2012 13:32:29 +0000 Received: by wgbez12 with SMTP id ez12so4387928wgb.18 for ; Tue, 31 Jul 2012 06:31:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=xwnInLAekNuEkDhuJYoWs41NjXn0uwNZRRCq7ug/aWM=; b=gGqewVpAjDNi0T9fciP0BgogI8mtgWqfqnCjSr5u2lowioUtle90qITXFzSOXvFznR uHtL6fuvBbZoUwXvHZddQL+HfexFDWLRuS5dBtRGo8mV9+vNiL2wLq6Nax+gniIx003E Yuz5dJ8oRIxeHIB0/3hkM9Dngqtt0Lnnu0PAxOWtJouXKAjvv/m0K1xYY+q8zMCG6EvC oVWlJXXHW2frFMipxQOS+QUqb0qmjL5y2LePqgTqHrlLw7w6DdSCaenusas6WXfUquUl MvwZVtrjndBVH68T3nlVhPE7cgFpdt6U9RfwHR5fQfiWst0fcJKeuTXNRLwm1fE7uhoS k3hg== Received: by 10.216.232.84 with SMTP id m62mr7152598weq.200.1343741515095; Tue, 31 Jul 2012 06:31:55 -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.53 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 31 Jul 2012 06:31:54 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] ARM: ux500: Fix merge error, so such struct 'snd_soc_u8500' Date: Tue, 31 Jul 2012 14:31:29 +0100 Message-Id: <1343741493-17671-9-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: ALoCoQlhkWXtfZG2A1eLrWOvTIxJHt+0cAjYtSNyecmjXQ810Xge925Cs/EhBQcNOjoF08jKMRMe X-Spam-Note: CRM114 invocation failed X-Spam-Note: SpamAssassin invocation failed Cc: ola.o.lilja@stericsson.com, alsa-devel@alsa-project.org, linus.walleij@stericsson.com, arnd@arndb.de, broonie@opensource.wolfsonmicro.com, olalilja@yahoo.se, STEricsson_nomadik_linux@list.st.com, Lee Jones , lrg@ti.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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,