diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-14 11:48:25 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-14 11:48:25 +0200 |
| commit | 34e51ce60a210094bd66cf0a75dd8512247618ca (patch) | |
| tree | 4c30cc4a0c1f7f8e758692f92492b226db4d6e2a /sound | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
| parent | 6e498d5eb6afb50659b4b7fc302d480ca0ceaa93 (diff) | |
| download | linux-stable-34e51ce60a210094bd66cf0a75dd8512247618ca.tar.gz linux-stable-34e51ce60a210094bd66cf0a75dd8512247618ca.tar.bz2 linux-stable-34e51ce60a210094bd66cf0a75dd8512247618ca.zip | |
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')
| -rw-r--r-- | sound/soc/pxa/magician.c | 2 | ||||
| -rw-r--r-- | sound/soc/s3c24xx/Kconfig | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c index f7c4544f7859..0625c342a1c9 100644 --- a/sound/soc/pxa/magician.c +++ b/sound/soc/pxa/magician.c @@ -27,8 +27,6 @@ #include <sound/soc.h> #include <sound/soc-dapm.h> -#include <mach/pxa-regs.h> -#include <mach/hardware.h> #include <mach/magician.h> #include <asm/mach-types.h> #include "../codecs/uda1380.h" 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 @@ config SND_S3C24XX_SOC tristate "SoC Audio for the Samsung S3CXXXX chips" - depends on ARCH_S3C2410 || ARCH_S3C64XX + depends on ARCH_S3C2410 help Say Y or M if you want to add support for codecs attached to - the S3C24XX and S3C64XX AC97, I2S or SSP interface. You will - also need to select the audio interfaces to support below. + the S3C24XX AC97 or I2S interfaces. You will also need to + select the audio interfaces to support below. config SND_S3C24XX_SOC_I2S tristate |