Merge branch 'topic/asoc' into for-linus
* topic/asoc: ASoC: Disable S3C64xx support in Kconfig ASoC: magician: remove un-necessary #include of pxa-regs.h and hardware.h
This commit is contained in:
Коммит
035f5afb02
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче