---

yaml --- r: 56169 b: refs/heads/master c: 1a23656 h: refs/heads/master i: 56167: 2332133 v: v3
git-mirror · May 11, 2007 · d9027e9 · d9027e9
1 parent e9b1cde
commit d9027e9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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