From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751598AbdLBGdn (ORCPT ); Sat, 2 Dec 2017 01:33:43 -0500 Received: from mail-pl0-f66.google.com ([209.85.160.66]:34158 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751367AbdLBGdm (ORCPT ); Sat, 2 Dec 2017 01:33:42 -0500 X-Google-Smtp-Source: AGs4zMYmHhlayKWs1wDEGNpuX4CVHv1KjTlHyeyzTGHR7avClzxikN2UrKeQtts3vUB5kBv2KGcs1w== From: Nicolin Chen To: broonie@kernel.org Cc: linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, tiwai@suse.com, perex@perex.cz, bhumirks@gmail.com Subject: [PATCH v2] ASoC: eukrea-tlv320: Remove include line of fsl_ssi.h 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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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(-) 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 -- 2.7.4