[ALSA] ASoC AT91xxxx build fix

This patch by Frank Madarino updates the AT91xxxx Makefile and Kconfig
to build the renamed SSC files.
Changes:-
o Rename various i2s labels to ssc

Signed-off-by: Frank Mandarino <fmandarino@endrelia.com>
Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

diff --git a/sound/soc/at91/Kconfig b/sound/soc/at91/Kconfig
index e41e75edc3dfc18bb0c3ad96d6158e2af71dc75a..5cb93fd3a4071d477cd38bab269b2bbfe2fda50d 100644 (file)
--- a/sound/soc/at91/Kconfig
+++ b/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.
 
          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
 
 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)
        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
        select SND_SOC_WM8731
        help
          Say Y if you want to add support for SoC audio on WM8731-based

diff --git a/sound/soc/at91/Makefile b/sound/soc/at91/Makefile
index b77b01ab2028e03c3d4394c56b1f45b1105690f1..f23da17cc3288e0e11ac2e951ffcf2a14b3e87bd 100644 (file)
--- a/sound/soc/at91/Makefile
+++ b/sound/soc/at91/Makefile
@@ -1,9 +1,9 @@
 # AT91 Platform Support
 snd-soc-at91-objs := at91-pcm.o
 # 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) += 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
 
 # AT91 Machine Support
 snd-soc-eti-b1-wm8731-objs := eti_b1_wm8731.o