Merge branch 'topic/jack-mechanical' into to-push

[linux-2.6-omap-h63xx.git] / sound / pci / cs5535audio / Makefile

diff --git a/sound/pci/cs5535audio/Makefile b/sound/pci/cs5535audio/Makefile
index 2911a8adc1f2380180033e86139cfc30ae40974a..fda7a94c992f1094f8b8d2c8d91dcb97fe868876 100644 (file)
--- a/sound/pci/cs5535audio/Makefile
+++ b/sound/pci/cs5535audio/Makefile
@@ -2,10 +2,10 @@
 # Makefile for cs5535audio
 #
 
-snd-cs5535audio-objs := cs5535audio.o cs5535audio_pcm.o
-
-ifdef CONFIG_PM
-snd-cs5535audio-objs += cs5535audio_pm.o
+snd-cs5535audio-y := cs5535audio.o cs5535audio_pcm.o
+snd-cs5535audio-$(CONFIG_PM) += cs5535audio_pm.o
+ifdef CONFIG_MGEODE_LX
+snd-cs5535audio-$(CONFIG_OLPC) += cs5535audio_olpc.o
 endif
 
 # Toplevel Module Dependency