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: 1249481 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id CC4163FD48 for ; Fri, 27 Jul 2012 12:53:49 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sujxk-0002HA-1U; Fri, 27 Jul 2012 12:48:12 +0000 Received: from mail-we0-f177.google.com ([74.125.82.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Sujpv-0001Ex-5T for linux-arm-kernel@lists.infradead.org; Fri, 27 Jul 2012 12:40:07 +0000 Received: by weyr3 with SMTP id r3so2249535wey.36 for ; Fri, 27 Jul 2012 05:39:11 -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=hrUhYjVc3BSTRXmrRNJUq6uKjFcpyY8C3cbVp4SkgS1fneCkcBJDq7Z9WzFIhgwpUU OUCl+C7tWwYfGL0wy3o5Rr8s7ywKRXcLa0qdRuMB5EAmiwTqInjcJGPlVlQhpNlH/ZvT 1S1ih6LbBEH1ObcuoKR0i7UHX2rfniqhRi9fAIG07jX+LM14KjGj7IXj53IFOB9XWmPS TjW8+jel85gEoxoQa8SuNaVfJD4U+2y7CjAMudZ6pk9sVDdHezTBcduuU4OkejapVXFi 0t4EULJRwrzM2hLsuFsVLxEGRjvzjc8+1wizDUQUWWxqWs4dLFQAON4Ky2wMpLwZAg6G kzew== 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 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: ALoCoQl8LRq5OOhMTYPH8QwyTg/mC+m7Ldb5uOYWdGVDkhHudrzsHBCzf4RIS4Nlx3sTPfJUVPb6 X-Spam-Note: CRM114 invocation failed X-Spam-Note: SpamAssassin invocation failed Cc: ola.o.lilja@stericsson.com, alsa-devel@alsa-project.org, sameo@linux.intel.com, arnd@arndb.de, broonie@opensource.wolfsonmicro.com, olalilja@yahoo.se, STEricsson_nomadik_linux@list.st.com, Lee Jones , lrg@ti.com, linus.walleij@stericsson.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,