diff options
author | Jarkko Nikula <jhnikula@gmail.com> | 2011-01-05 05:05:44 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-05 06:28:50 -0500 |
commit | 5e79d64b038ae0039663f721f4b9f5ce1951d9da (patch) | |
tree | 5f7d2f9e8eb9922cea03462deb5abfbe9038a8a8 /sound | |
parent | 74d2b7a34bb69dcbb0a83736c53c33bdc1a6d468 (diff) |
ASoC: Remove needless inclusion of tlv320aic3x.h from machine drivers
After multi-component conversion these machine drivers don't actually need
anything from sound/soc/codecs/tlv320aic3x.h so don't include it.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/davinci/davinci-evm.c | 1 | ||||
-rw-r--r-- | sound/soc/omap/n810.c | 1 | ||||
-rw-r--r-- | sound/soc/omap/rx51.c | 1 | ||||
-rw-r--r-- | sound/soc/s6000/s6105-ipcam.c | 1 | ||||
-rw-r--r-- | sound/soc/samsung/s3c24xx_simtec_hermes.c | 2 |
5 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index 24b031e26342..0c2d6bacc681 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <mach/edma.h> | 26 | #include <mach/edma.h> |
27 | #include <mach/mux.h> | 27 | #include <mach/mux.h> |
28 | 28 | ||
29 | #include "../codecs/tlv320aic3x.h" | ||
30 | #include "davinci-pcm.h" | 29 | #include "davinci-pcm.h" |
31 | #include "davinci-i2s.h" | 30 | #include "davinci-i2s.h" |
32 | #include "davinci-mcasp.h" | 31 | #include "davinci-mcasp.h" |
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index fe215f3e8afc..83d213bfd3d1 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c | |||
@@ -35,7 +35,6 @@ | |||
35 | 35 | ||
36 | #include "omap-mcbsp.h" | 36 | #include "omap-mcbsp.h" |
37 | #include "omap-pcm.h" | 37 | #include "omap-pcm.h" |
38 | #include "../codecs/tlv320aic3x.h" | ||
39 | 38 | ||
40 | #define N810_HEADSET_AMP_GPIO 10 | 39 | #define N810_HEADSET_AMP_GPIO 10 |
41 | #define N810_SPEAKER_AMP_GPIO 101 | 40 | #define N810_SPEAKER_AMP_GPIO 101 |
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c index 150042a785d0..09fb0df8d416 100644 --- a/sound/soc/omap/rx51.c +++ b/sound/soc/omap/rx51.c | |||
@@ -36,7 +36,6 @@ | |||
36 | 36 | ||
37 | #include "omap-mcbsp.h" | 37 | #include "omap-mcbsp.h" |
38 | #include "omap-pcm.h" | 38 | #include "omap-pcm.h" |
39 | #include "../codecs/tlv320aic3x.h" | ||
40 | 39 | ||
41 | #define RX51_TVOUT_SEL_GPIO 40 | 40 | #define RX51_TVOUT_SEL_GPIO 40 |
42 | #define RX51_JACK_DETECT_GPIO 177 | 41 | #define RX51_JACK_DETECT_GPIO 177 |
diff --git a/sound/soc/s6000/s6105-ipcam.c b/sound/soc/s6000/s6105-ipcam.c index bf3f3f9165e4..5890e431852f 100644 --- a/sound/soc/s6000/s6105-ipcam.c +++ b/sound/soc/s6000/s6105-ipcam.c | |||
@@ -21,7 +21,6 @@ | |||
21 | 21 | ||
22 | #include <variant/dmac.h> | 22 | #include <variant/dmac.h> |
23 | 23 | ||
24 | #include "../codecs/tlv320aic3x.h" | ||
25 | #include "s6000-pcm.h" | 24 | #include "s6000-pcm.h" |
26 | #include "s6000-i2s.h" | 25 | #include "s6000-i2s.h" |
27 | 26 | ||
diff --git a/sound/soc/samsung/s3c24xx_simtec_hermes.c b/sound/soc/samsung/s3c24xx_simtec_hermes.c index 0083aff5a83d..bb4292e3596c 100644 --- a/sound/soc/samsung/s3c24xx_simtec_hermes.c +++ b/sound/soc/samsung/s3c24xx_simtec_hermes.c | |||
@@ -21,8 +21,6 @@ | |||
21 | #include "s3c24xx-i2s.h" | 21 | #include "s3c24xx-i2s.h" |
22 | #include "s3c24xx_simtec.h" | 22 | #include "s3c24xx_simtec.h" |
23 | 23 | ||
24 | #include "../codecs/tlv320aic3x.h" | ||
25 | |||
26 | static const struct snd_soc_dapm_widget dapm_widgets[] = { | 24 | static const struct snd_soc_dapm_widget dapm_widgets[] = { |
27 | SND_SOC_DAPM_LINE("GSM Out", NULL), | 25 | SND_SOC_DAPM_LINE("GSM Out", NULL), |
28 | SND_SOC_DAPM_LINE("GSM In", NULL), | 26 | SND_SOC_DAPM_LINE("GSM In", NULL), |