From d9027e9e80435e1d6a233f66ac36a0a089943a43 Mon Sep 17 00:00:00 2001 From: Frank Mandarino Date: Mon, 16 Apr 2007 17:20:09 +0200 Subject: [PATCH] --- yaml --- r: 56169 b: refs/heads/master c: 1a236566ea320a05f3892d8dedd4b5c6bff8706b h: refs/heads/master i: 56167: 23321334b02458dc00b14147ab21fb0283a43c4a v: v3 --- [refs] | 2 +- trunk/sound/soc/at91/Kconfig | 6 +++--- trunk/sound/soc/at91/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 9c4c6c5e9a82..9f4c203b7baa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb831da553d1526b9acd5ee4cd83ff52ae446c5f +refs/heads/master: 1a236566ea320a05f3892d8dedd4b5c6bff8706b diff --git a/trunk/sound/soc/at91/Kconfig b/trunk/sound/soc/at91/Kconfig index e41e75edc3df..5cb93fd3a407 100644 --- a/trunk/sound/soc/at91/Kconfig +++ b/trunk/sound/soc/at91/Kconfig @@ -6,13 +6,13 @@ config SND_AT91_SOC the AT91 SSC interface. You will also need to select the audio interfaces to support below. -config SND_AT91_SOC_I2S +config SND_AT91_SOC_SSC tristate config SND_AT91_SOC_ETI_B1_WM8731 - tristate "SoC I2S Audio support for WM8731-based Endrelia ETI-B1 boards" + tristate "SoC Audio support for WM8731-based Endrelia ETI-B1 boards" depends on SND_AT91_SOC && (MACH_ETI_B1 || MACH_ETI_C1) - select SND_AT91_SOC_I2S + select SND_AT91_SOC_SSC select SND_SOC_WM8731 help Say Y if you want to add support for SoC audio on WM8731-based diff --git a/trunk/sound/soc/at91/Makefile b/trunk/sound/soc/at91/Makefile index b77b01ab2028..f23da17cc328 100644 --- a/trunk/sound/soc/at91/Makefile +++ b/trunk/sound/soc/at91/Makefile @@ -1,9 +1,9 @@ # AT91 Platform Support snd-soc-at91-objs := at91-pcm.o -snd-soc-at91-i2s-objs := at91-i2s.o +snd-soc-at91-ssc-objs := at91-ssc.o obj-$(CONFIG_SND_AT91_SOC) += snd-soc-at91.o -obj-$(CONFIG_SND_AT91_SOC_I2S) += snd-soc-at91-i2s.o +obj-$(CONFIG_SND_AT91_SOC_SSC) += snd-soc-at91-ssc.o # AT91 Machine Support snd-soc-eti-b1-wm8731-objs := eti_b1_wm8731.o