Skip to content

Commit

Permalink
ASoC: eukrea-tlv320: Remove include line of fsl_ssi.h
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Nicolin Chen authored and Mark Brown committed Dec 4, 2017
1 parent 4fbd8d1 commit 8f1a1df
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion sound/soc/fsl/eukrea-tlv320.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

#include "../codecs/tlv320aic23.h"
#include "imx-ssi.h"
#include "fsl_ssi.h"
#include "imx-audmux.h"

#define CODEC_CLOCK 12000000
Expand Down

0 comments on commit 8f1a1df

Please sign in to comment.