Message ID | 1512196355-9216-1-git-send-email-nicoleotsuka@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show
Return-Path: <alsa-devel-bounces@alsa-project.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7EEC36035E for <patchwork-alsa-devel@patchwork.kernel.org>; Sat, 2 Dec 2017 06:33:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D4CF28D36 for <patchwork-alsa-devel@patchwork.kernel.org>; Sat, 2 Dec 2017 06:33:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6156729CC6; Sat, 2 Dec 2017 06:33:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A2AC28D36 for <patchwork-alsa-devel@patchwork.kernel.org>; Sat, 2 Dec 2017 06:33:47 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 91DC226718D; Sat, 2 Dec 2017 07:33:45 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id DDF43267190; Sat, 2 Dec 2017 07:33:44 +0100 (CET) Received: from mail-pl0-f67.google.com (mail-pl0-f67.google.com [209.85.160.67]) by alsa0.perex.cz (Postfix) with ESMTP id 247B1266B67 for <alsa-devel@alsa-project.org>; Sat, 2 Dec 2017 07:33:42 +0100 (CET) Received: by mail-pl0-f67.google.com with SMTP id x4so7522868plv.10 for <alsa-devel@alsa-project.org>; Fri, 01 Dec 2017 22:33:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=6+p3wDk50RVEA50e5QMbnnwb0iZvaCpa+eoYttdIpYU=; b=hryKguMNwZE1Zjp3ZENbt7zJUhbWJ7UdA8J+phGLup5dQbRcDgLbkJEr3Ia/LVRKE/ dFDV8a3qqhnaU0y7P3U7Am3OtZYCC/dzwhk4ATpOOU1Z8YNzoSAO+3t6TgBSC24+aTeP v5iyC8mjom/oNIX2sakfooiDi2ZpvmmwdJaazNZ8y0ZferbGxtlAdHYcpemdP+Rtm2WG eaevJtuKFD+TlHyWOd+NxoqwH8xhDfhKLnf6GBE6hZ/ge0m3EgfPy9J4A9AZ6cCpWHVh eLc+BjF3C+c3JkvFNp8ZJ6ih0sqOR1RndoL5Y4FuT39Y2xKGFyu2EFZNA8ODctBjcNRP mjZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=6+p3wDk50RVEA50e5QMbnnwb0iZvaCpa+eoYttdIpYU=; b=PcT87P9oy01WZUKHkIz94K5tDY1sMC2Taq/N1j6saqcE6uRKRxMgU4e62KWjub0JHY OIcFU0bUDdjPZCEB3+SHHBNNi5Fe77fNsU3Miag0R6xVKbT0SmUwF4gEZDUHK/FfTj2a Fxd6KuT55L6mMWGMpJD/9nQSnkCY6qd0+1UNA8IRIlwGJu0IqoLUAklFQWPuPuusIaWh j8fYvi2NX28n8OB5bn3C8wz4dcloLNpnm94zQeQpABYP4MYFG6ICek/YVxzJFVixdWE2 o/JfJQfA60f6LzsxylwSKUWMwGiQVZJglMR/2sfR8N8PidU5sT7M/Mu7yZWeScmbDfGI Oxuw== X-Gm-Message-State: AJaThX70i59sq9Ps1vOHDTKaryiift1YSI+aDs0zr6grbiyTCC7j+nqA h712SuxqdArq3DFas46itb8= X-Google-Smtp-Source: AGs4zMYmHhlayKWs1wDEGNpuX4CVHv1KjTlHyeyzTGHR7avClzxikN2UrKeQtts3vUB5kBv2KGcs1w== X-Received: by 10.84.132.66 with SMTP id 60mr8443787ple.281.1512196421760; Fri, 01 Dec 2017 22:33:41 -0800 (PST) Received: from Asurada-CZ80.localdomain (c-73-231-2-134.hsd1.ca.comcast.net. [73.231.2.134]) by smtp.gmail.com with ESMTPSA id v64sm15005386pfi.187.2017.12.01.22.33.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Dec 2017 22:33:41 -0800 (PST) From: Nicolin Chen <nicoleotsuka@gmail.com> To: broonie@kernel.org Date: Fri, 1 Dec 2017 22:32:35 -0800 Message-Id: <1512196355-9216-1-git-send-email-nicoleotsuka@gmail.com> X-Mailer: git-send-email 2.7.4 Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, bhumirks@gmail.com, tiwai@suse.com Subject: [alsa-devel] [PATCH v2] ASoC: eukrea-tlv320: Remove include line of fsl_ssi.h X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" <alsa-devel.alsa-project.org> List-Unsubscribe: <http://mailman.alsa-project.org/mailman/options/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel/> List-Post: <mailto:alsa-devel@alsa-project.org> List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/sound/soc/fsl/eukrea-tlv320.c b/sound/soc/fsl/eukrea-tlv320.c index 84ef638..191426a 100644 --- a/sound/soc/fsl/eukrea-tlv320.c +++ b/sound/soc/fsl/eukrea-tlv320.c @@ -29,7 +29,6 @@ #include "../codecs/tlv320aic23.h" #include "imx-ssi.h" -#include "fsl_ssi.h" #include "imx-audmux.h" #define CODEC_CLOCK 12000000
The machine driver links both imx-ssi (legacy non-DT driver) and fsl_ssi (up-to-date DT based driver). So It also includes both imx-ssi.h and fsl_ssi.h header files. This creates a limitation for two header files -- they can't define anything with identical names. Since the eukrea-tlv320 machine driver now does not really need anything being defined in the fsl_ssi header file, and it's also going to take some time to clean up two SSI drivers, this patch takes a quick way to remove the #include fsl_ssi.h line for now. It can be added back once the header files are done refactoring. The eukrea-tlv320 driver is still compiled successfully without any erorr using imx_v6_v7_defconfig, after removing it. Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com> --- Changelog v2: * Fixed a typo in the commit log at imx_v6_v7_defconfig sound/soc/fsl/eukrea-tlv320.c | 1 - 1 file changed, 1 deletion(-)