* [PATCH 2/2]ASoC: multi-component - Fix S5P compile error
@ 2010-07-19 12:45 Chanwoo Choi
2010-07-19 13:04 ` Mark Brown
0 siblings, 1 reply; 3+ messages in thread
From: Chanwoo Choi @ 2010-07-19 12:45 UTC (permalink / raw)
To: alsa-devel
Cc: Jassi Brar, Kyungmin Park, Mark Brown, Joonyoung Shim,
Liam Girdwood
This patch fix compile error on using I2S and WM8994 common code.
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
sound/soc/codecs/Kconfig | 4 ++--
sound/soc/s3c24xx/s3c-i2s-v2.c | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index ea1f5ed..55bc2be 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -85,8 +85,8 @@ config SND_SOC_ALL_CODECS
config SND_SOC_WM_HUBS
tristate
- default y if SND_SOC_WM8993=y
- default m if SND_SOC_WM8993=m
+ default y if SND_SOC_WM8993=y || SND_SOC_WM8994=y
+ default m if SND_SOC_WM8993=m || SND_SOC_WM8994=m
config SND_SOC_AC97_CODEC
tristate
diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c
index 6575410..f4fbc0e 100644
--- a/sound/soc/s3c24xx/s3c-i2s-v2.c
+++ b/sound/soc/s3c24xx/s3c-i2s-v2.c
@@ -32,7 +32,8 @@
#undef S3C_IIS_V2_SUPPORTED
-#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
+#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413) \
+ || defined(CONFIG_CPU_S5PV210)
#define S3C_IIS_V2_SUPPORTED
#endif
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2]ASoC: multi-component - Fix S5P compile error
2010-07-19 12:45 [PATCH 2/2]ASoC: multi-component - Fix S5P compile error Chanwoo Choi
@ 2010-07-19 13:04 ` Mark Brown
2010-07-19 13:17 ` Chanwoo Choi
0 siblings, 1 reply; 3+ messages in thread
From: Mark Brown @ 2010-07-19 13:04 UTC (permalink / raw)
To: Chanwoo Choi
Cc: alsa-devel, Jassi Brar, Liam Girdwood, Kyungmin Park,
Joonyoung Shim
On Mon, Jul 19, 2010 at 09:45:49PM +0900, Chanwoo Choi wrote:
> This patch fix compile error on using I2S and WM8994 common code.
This looks to be two completely separate issues and should have been
sent as two separate patches, especially this one:
> -#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
> +#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413) \
> + || defined(CONFIG_CPU_S5PV210)
> #define S3C_IIS_V2_SUPPORTED
This is implmenting support for a new CPU, not fixing compile errors,
and so the commit message is very misleading.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2]ASoC: multi-component - Fix S5P compile error
2010-07-19 13:04 ` Mark Brown
@ 2010-07-19 13:17 ` Chanwoo Choi
0 siblings, 0 replies; 3+ messages in thread
From: Chanwoo Choi @ 2010-07-19 13:17 UTC (permalink / raw)
To: Mark Brown
Cc: alsa-devel, Joonyoung Shim, Jassi Brar, Chanwoo Choi,
Kyungmin Park, Liam Girdwood
Mark Brown wrote:
> On Mon, Jul 19, 2010 at 09:45:49PM +0900, Chanwoo Choi wrote:
>> This patch fix compile error on using I2S and WM8994 common code.
>
> This looks to be two completely separate issues and should have been
> sent as two separate patches, especially this one:
>
Ok, I will do.
>> -#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
>> +#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413) \
>> + || defined(CONFIG_CPU_S5PV210)
>> #define S3C_IIS_V2_SUPPORTED
>
> This is implmenting support for a new CPU, not fixing compile errors,
> and so the commit message is very misleading.
Ok, I will modify the commit message.
Thank you,
Chanwoo Choi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-07-19 13:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-19 12:45 [PATCH 2/2]ASoC: multi-component - Fix S5P compile error Chanwoo Choi
2010-07-19 13:04 ` Mark Brown
2010-07-19 13:17 ` Chanwoo Choi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.