diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-10 17:23:24 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-10 17:23:24 +0100 |
| commit | f144b7f6679d9833bd3b94b91e452592b6d0e502 (patch) | |
| tree | 56187934d7878e129cd43e496fee540be45a869d | |
| parent | 0fb497f5b6ff8da1e9e60afb39835f40d7f043ec (diff) | |
| download | kernel_goldelico_gta04-f144b7f6679d9833bd3b94b91e452592b6d0e502.zip kernel_goldelico_gta04-f144b7f6679d9833bd3b94b91e452592b6d0e502.tar.gz kernel_goldelico_gta04-f144b7f6679d9833bd3b94b91e452592b6d0e502.tar.bz2 | |
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>
| -rw-r--r-- | sound/pci/cs5535audio/Makefile | 2 | ||||
| -rw-r--r-- | sound/pci/cs5535audio/cs5535audio.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/cs5535audio/Makefile b/sound/pci/cs5535audio/Makefile index ccc6422..fda7a94 100644 --- a/sound/pci/cs5535audio/Makefile +++ b/sound/pci/cs5535audio/Makefile @@ -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 diff --git a/sound/pci/cs5535audio/cs5535audio.h b/sound/pci/cs5535audio/cs5535audio.h index 7777037..7a298ac 100644 --- a/sound/pci/cs5535audio/cs5535audio.h +++ b/sound/pci/cs5535audio/cs5535audio.h @@ -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); |