Merge branches 'oprofile-v2' and 'timers/hpet' into x86/core-v4

[linux-2.6-omap-h63xx.git] / sound / soc / at91 / Makefile

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
-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