Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f144b7f6 authored Dec 10, 2008 by Takashi Iwai

ALSA: cs5535 - Make OLPC-stuff depending on MGEODE_LX



The GPIO stuff for OLPC in cs5535audio_olpc.c is implemented only for
Geode-LX, and enabled only when CONFIG_MGEODE_LX=y.  Without this
config option, the driver gets build errors.

This patch adds a workaround to make it dependent on CONFIG_MGEODE_LX.

Ideally, the OLPC-GPIO stuff should be implemented in a way
independent from CPU type selection...

Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent 0fb497f5

sound/pci/cs5535audio/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -4,7 +4,9 @@

		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
		obj-$(CONFIG_SND_CS5535AUDIO) += snd-cs5535audio.o

sound/pci/cs5535audio/cs5535audio.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ int snd_cs5535audio_suspend(struct pci_dev *pci, pm_message_t state);
		int snd_cs5535audio_resume(struct pci_dev *pci);
		#endif

		#ifdef CONFIG_OLPC
		#if defined(CONFIG_OLPC) && defined(CONFIG_MGEODE_LX)
		void __devinit olpc_prequirks(struct snd_card *card,
		struct snd_ac97_template *ac97);
		int __devinit olpc_quirks(struct snd_card card, struct snd_ac97 ac97);