diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-14 05:48:25 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-14 05:48:25 -0400 |
| commit | 34e51ce60a210094bd66cf0a75dd8512247618ca (patch) | |
| tree | 4c30cc4a0c1f7f8e758692f92492b226db4d6e2a /sound/soc/s3c24xx | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
| parent | 6e498d5eb6afb50659b4b7fc302d480ca0ceaa93 (diff) | |
Merge branch 'for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
Diffstat (limited to 'sound/soc/s3c24xx')
| -rw-r--r-- | sound/soc/s3c24xx/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig index 2f3a21eee051..df494d1e346f 100644 --- a/sound/soc/s3c24xx/Kconfig +++ b/sound/soc/s3c24xx/Kconfig | |||
| @@ -1,10 +1,10 @@ | |||
| 1 | config SND_S3C24XX_SOC | 1 | config SND_S3C24XX_SOC |
| 2 | tristate "SoC Audio for the Samsung S3CXXXX chips" | 2 | tristate "SoC Audio for the Samsung S3CXXXX chips" |
| 3 | depends on ARCH_S3C2410 || ARCH_S3C64XX | 3 | depends on ARCH_S3C2410 |
| 4 | help | 4 | help |
| 5 | Say Y or M if you want to add support for codecs attached to | 5 | Say Y or M if you want to add support for codecs attached to |
| 6 | the S3C24XX and S3C64XX AC97, I2S or SSP interface. You will | 6 | the S3C24XX AC97 or I2S interfaces. You will also need to |
| 7 | also need to select the audio interfaces to support below. | 7 | select the audio interfaces to support below. |
| 8 | 8 | ||
| 9 | config SND_S3C24XX_SOC_I2S | 9 | config SND_S3C24XX_SOC_I2S |
| 10 | tristate | 10 | tristate |