[PATCH] ALSA: cs5535audio: only build OLPC support if MGEODE_LX is defined

[Andres Salomon <dilinger@queued.net>]

On Thu, 13 Nov 2008 16:54:19 +0100
Takashi Iwai <tiwai@suse.de> wrote:

> At Thu, 13 Nov 2008 16:37:14 +0100,
> Pavel Machek wrote:
[...]
> > 
> > > IMO, the basic problem is rather that the platform and the CPU
> > > selection is mixed up.  The geode GPIO stuff shouldn't belong to
> > > CPU selection.
> > 
> > ACK... and suggested patch makes it worse.
> > 
> > There should be option 'support OLPC' somewhere, and that should
> > enable the gpio bits. Alsa driver should depend on that one.
> 
> Any better fix patch is welcome, of course :)
> This would make save a lot time than writing mails...
> 
> 
> thanks,
> 
> Takashi


Okay, how about something like the following?







This is a temporary work-around until the geode_gpio* calls are moved out
into a separate config option.  We don't want to force generic kernel
maintainers to have to build a specific OLPC kernel.

Signed-off-by: Andres Salomon <dilinger@debian.org>
---
 sound/pci/cs5535audio/Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 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
-- 
1.5.6.5