dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge branch 'for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc

This commit is contained in:
Takashi Iwai 2009-04-14 11:48:25 +02:00
parent 577c9c456f 6e498d5eb6
commit 34e51ce60a
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/pxa/magician.c
View File

@ -27,8 +27,6 @@
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/soc-dapm.h> #include <sound/soc-dapm.h>
#include <mach/pxa-regs.h>
#include <mach/hardware.h>
#include <mach/magician.h> #include <mach/magician.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include "../codecs/uda1380.h" #include "../codecs/uda1380.h"

6
sound/soc/s3c24xx/Kconfig
View File

@ -1,10 +1,10 @@
config SND_S3C24XX_SOC config SND_S3C24XX_SOC
tristate "SoC Audio for the Samsung S3CXXXX chips" tristate "SoC Audio for the Samsung S3CXXXX chips"
depends on ARCH_S3C2410 || ARCH_S3C64XX depends on ARCH_S3C2410
help help
Say Y or M if you want to add support for codecs attached to 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 the S3C24XX AC97 or I2S interfaces. You will also need to
also need to select the audio interfaces to support below. select the audio interfaces to support below.
config SND_S3C24XX_SOC_I2S config SND_S3C24XX_SOC_I2S
tristate tristate