configuration dependency with PCIGAME fix 2.4.22-pre1

Hi Marcelo,

Please consider this patch for 2.4.22-pre2. When pcigame is chosen as modular (CONFIG_INPUT_PCIGAME=m), and trident as builtin (CONFIG_SOUND_TRIDENT=y), trident will not link because it won't find pcigame_attach(). This patch adds a dependency for trident on pcigame, but only if pcigame != n. Patch is against 2.4.22-pre1(cvs).

Patch works, confirmed by the original bug reporter.

Thanks!

diff -Naur --exclude-from /home/mulix/dontdiff linux-2.4/drivers/sound/Config.in linux-2.4.22-pre1-mx/drivers/sound/Config.in
@@ -70,7 +70,13 @@
     dep_tristate '  Au1000 Sound' CONFIG_SOUND_AU1000 $CONFIG_SOUND
 fi
 
-dep_tristate '  Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core' CONFIG_SOUND_TRIDENT $CONFIG_SOUND $CONFIG_PCI
+# This is fairly ugly. If pcigame is off, we have no dependency on it. 
+# However, if it's on and modular, we need to be modular too 
+if [ "$CONFIG_INPUT_PCIGAME" = "n" ]; then 

a+ dep_tristate ' Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core' CONFIG_SOUND_TRIDENT $CONFIG_SOUND $CONFIG_PCI
+else
+ dep_tristate ' Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core' CONFIG_SOUND_TRIDENT $CONFIG_SOUND $CONFIG_PCI $CONFIG_INPUT_PCIGAME
+fi

dep_tristate ' Support for Turtle Beach MultiSound Classic, Tahiti, Monterey' CONFIG_SOUND_MSNDCLAS $CONFIG_SOUND if [ "$CONFIG_SOUND_MSNDCLAS" = "y" -o "$CONFIG_SOUND_MSNDCLAS" = "m" ]; then

Muli Ben-Yehuda
http://www.mulix.org
http://www.livejournal.com/~mulix/