Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34e51ce6 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-2.6.30' of... 

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

sound/soc/pxa/magician.c

+0 −2
Original line number Diff line number Diff line
@@ -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"

sound/soc/s3c24xx/Kconfig

+3 −3
Original line number Diff line number Diff line 
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