diff options
author | Frank Mandarino <fmandarino@endrelia.com> | 2007-04-16 11:20:09 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-05-11 10:56:02 -0400 |
commit | 1a236566ea320a05f3892d8dedd4b5c6bff8706b (patch) | |
tree | 88e7f913b66bbea36a67f2523b32602e556baa95 /sound/soc | |
parent | eb831da553d1526b9acd5ee4cd83ff52ae446c5f (diff) |
[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>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/at91/Kconfig | 6 | ||||
-rw-r--r-- | sound/soc/at91/Makefile | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/at91/Kconfig b/sound/soc/at91/Kconfig index e41e75edc3df..5cb93fd3a407 100644 --- a/sound/soc/at91/Kconfig +++ b/sound/soc/at91/Kconfig | |||
@@ -6,13 +6,13 @@ config SND_AT91_SOC | |||
6 | the AT91 SSC interface. You will also need | 6 | the AT91 SSC interface. You will also need |
7 | to select the audio interfaces to support below. | 7 | to select the audio interfaces to support below. |
8 | 8 | ||
9 | config SND_AT91_SOC_I2S | 9 | config SND_AT91_SOC_SSC |
10 | tristate | 10 | tristate |
11 | 11 | ||
12 | config SND_AT91_SOC_ETI_B1_WM8731 | 12 | config SND_AT91_SOC_ETI_B1_WM8731 |
13 | tristate "SoC I2S Audio support for WM8731-based Endrelia ETI-B1 boards" | 13 | tristate "SoC Audio support for WM8731-based Endrelia ETI-B1 boards" |
14 | depends on SND_AT91_SOC && (MACH_ETI_B1 || MACH_ETI_C1) | 14 | depends on SND_AT91_SOC && (MACH_ETI_B1 || MACH_ETI_C1) |
15 | select SND_AT91_SOC_I2S | 15 | select SND_AT91_SOC_SSC |
16 | select SND_SOC_WM8731 | 16 | select SND_SOC_WM8731 |
17 | help | 17 | help |
18 | Say Y if you want to add support for SoC audio on WM8731-based | 18 | 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 b77b01ab2028..f23da17cc328 100644 --- a/sound/soc/at91/Makefile +++ b/sound/soc/at91/Makefile | |||
@@ -1,9 +1,9 @@ | |||
1 | # AT91 Platform Support | 1 | # AT91 Platform Support |
2 | snd-soc-at91-objs := at91-pcm.o | 2 | snd-soc-at91-objs := at91-pcm.o |
3 | snd-soc-at91-i2s-objs := at91-i2s.o | 3 | snd-soc-at91-ssc-objs := at91-ssc.o |
4 | 4 | ||
5 | obj-$(CONFIG_SND_AT91_SOC) += snd-soc-at91.o | 5 | obj-$(CONFIG_SND_AT91_SOC) += snd-soc-at91.o |
6 | obj-$(CONFIG_SND_AT91_SOC_I2S) += snd-soc-at91-i2s.o | 6 | obj-$(CONFIG_SND_AT91_SOC_SSC) += snd-soc-at91-ssc.o |
7 | 7 | ||
8 | # AT91 Machine Support | 8 | # AT91 Machine Support |
9 | snd-soc-eti-b1-wm8731-objs := eti_b1_wm8731.o | 9 | snd-soc-eti-b1-wm8731-objs := eti_b1_wm8731.o |