From patchwork Thu Jul 26 10:28:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 10252 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 EAF1E23E56 for ; Thu, 26 Jul 2012 10:29:22 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id BB342A18866 for ; Thu, 26 Jul 2012 10:29:22 +0000 (UTC) Received: by ggnf1 with SMTP id f1so1772698ggn.11 for ; Thu, 26 Jul 2012 03:29:22 -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=EK7pIUvn0tHNtilRtmg4SG4LM3aGf0UG78mvhn3iqXc=; b=eqWz9zsZ/XizjD+hqExhhxWKIrLOLMqpYxdULovGBXhLpzCFochii16NyFAsHz6Snl mer6609V/nXHXWLRLejFU005M+eoYny632StUhbvN5hqzL949iSTs6ClASXctlIXcVvi u+X8AiFbXb/yozqGbZtMCYy1etU2k+xRla+3Y7z5IB5Nr/R41n0sAdvHzubiXYqFfLq2 5JNiPPxG5S3Xf+Tr12UgNwepEOJAyirU8MZPPKFvaly2p4uuopdrRiJYdxGCugCkWQIK EOSX1avdYOxfJvnWpIk8NR7Dz/JcnBTOPhsiPyoJS0CqqouWLSvzinnOH8jaJ2V2H8Cp IkLQ== Received: by 10.50.220.136 with SMTP id pw8mr1182063igc.1.1343298562125; Thu, 26 Jul 2012 03:29:22 -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 bs3csp133354icc; Thu, 26 Jul 2012 03:29:21 -0700 (PDT) Received: by 10.180.100.131 with SMTP id ey3mr12266849wib.15.1343298560724; Thu, 26 Jul 2012 03:29:20 -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 h18si9793045wiw.39.2012.07.26.03.29.20 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 03:29:20 -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 mail-we0-f178.google.com with SMTP id u7so1432759wey.37 for ; Thu, 26 Jul 2012 03:29:20 -0700 (PDT) Received: by 10.180.91.1 with SMTP id ca1mr12298308wib.8.1343298560049; Thu, 26 Jul 2012 03:29:20 -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 fb20sm11559455wid.1.2012.07.26.03.29.18 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 03:29:19 -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, broonie@opensource.wolfsonmicro.com, sameo@linux.intel.com, olalilja@yahoo.se, ola.o.lilja@stericsson.com, alsa-devel@alsa-project.org, lrg@ti.com, Lee Jones Subject: [PATCH 05/21] ASoC: ux500: Include the correct header files Date: Thu, 26 Jul 2012 11:28:38 +0100 Message-Id: <1343298534-13611-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343298534-13611-1-git-send-email-lee.jones@linaro.org> References: <1343298534-13611-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkX8541/fzJoyRLoxWD3fS34PhgSTyeXhxoJCKz5Z4corIAUnYgc0Bt0fgAJH3m0bCypVRz Thought to be another merge error, board-mop500-msp.h has never existed in the upstream kernel, only msp.h. This patch changes the include files to match the existing file name. Signed-off-by: Lee Jones --- sound/soc/ux500/ux500_msp_dai.c | 2 +- sound/soc/ux500/ux500_msp_i2s.c | 2 +- sound/soc/ux500/ux500_msp_i2s.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index cdbbdaf..772cb19 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c index 4c79850..36be11e 100644 --- a/sound/soc/ux500/ux500_msp_i2s.c +++ b/sound/soc/ux500/ux500_msp_i2s.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h index 7f71b4a..2d9136d 100644 --- a/sound/soc/ux500/ux500_msp_i2s.h +++ b/sound/soc/ux500/ux500_msp_i2s.h @@ -17,7 +17,7 @@ #include -#include +#include #define MSP_INPUT_FREQ_APB 48000000