| Message ID | 1512195805-9023-1-git-send-email-nicoleotsuka@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8f1a1df58e011e54ffcc2acd09249579e9467544 |
| Headers | show |
[PATCH 9/9] ASoC: eukrea-tlv320: Remove include line of fsl_ssi.h Please ignore the "9/9" in the tag...I forgot to clean it. It would be removed after getting applied though...
On Fri, Dec 01, 2017 at 10:23:25PM -0800, Nicolin Chen wrote: > The eukrea-tlv320 driver is still compiled successfully without > any erorr using imx_v6_v6_defconfig, after removing it. A typo here, should be imx_v6_v7_defconfig. Sending a v2 anyway. Please ignore this version. Thanks.
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_v6_defconfig, after removing it. Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com> --- sound/soc/fsl/eukrea-tlv320.c | 1 - 1 file changed, 1 deletion(-)