Re: Linux 2.6.0-test6

[Muli Ben-Yehuda <mulix@mulix.org>]

[-- Attachment #1: Type: text/plain, Size: 3061 bytes --]

On Mon, Sep 29, 2003 at 04:01:09PM +0200, Jaroslav Kysela wrote:
> On Mon, 29 Sep 2003, Muli Ben-Yehuda wrote:
> 
> > On Mon, Sep 29, 2003 at 08:23:55AM -0500, Florin Iucha wrote:
> >
> > > I can no longer select my soundcard: In test5 it was configured by
> > > CONFIG_SND_CS46XX! This option is no longer available in test6 (make
> > > menuconfig does not offer me the opportunity).
> >
> > You need to enable CONFIG_GAMEPORT, or apply this patch. Jaroslav, is
> > there a master plan for the CONFIG_SOUND_GAMEPORT -> CONFIG_GAMEPORT
> > conversion or is it a bug? this patch reverts it.
> 
> CONFIG_SOUND_GAMEPORT define is ugly. It's better to remove all gameport
> dependencies from the ALSA's configuration files and let drivers to
> detect the gameport presence at "compile" time.

I think it's a build system issue and thus should be handled by the
build system, not by #ifdefs. However, if that's the way you prefer
it, here's a patch to remove the GAMEPORT dependencies from
sound/pci/Kconfig. From a quick glance, all affected drivers have the
necessary ifdefs. 

diff -Naur --exclude-from /home/muli/p/dontdiff linux-2.5/sound/pci/Kconfig revert-alsa-gameport-2.6.0-t6/sound/pci/Kconfig
--- linux-2.5/sound/pci/Kconfig	Mon Sep 29 16:46:37 2003
+++ revert-alsa-gameport-2.6.0-t6/sound/pci/Kconfig	Mon Sep 29 17:14:36 2003
@@ -17,7 +17,7 @@
 
 config SND_CS46XX
 	tristate "Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x"
-	depends on SND && GAMEPORT
+	depends on SND
 	help
 	  Say 'Y' or 'M' to include support for Cirrus Logic CS4610 / CS4612 /
 	  CS4614 / CS4615 / CS4622 / CS4624 / CS4630 / CS4280 chips.
@@ -30,7 +30,7 @@
 
 config SND_CS4281
 	tristate "Cirrus Logic (Sound Fusion) CS4281"
-	depends on SND && GAMEPORT
+	depends on SND
 	help
 	  Say 'Y' or 'M' to include support for Cirrus Logic CS4281.
 
@@ -83,7 +83,7 @@
 
 config SND_TRIDENT
 	tristate "Trident 4D-Wave DX/NX; SiS 7018"
-	depends on SND && GAMEPORT
+	depends on SND
 	help
 	  Say 'Y' or 'M' to include support for Trident 4D-Wave DX/NX and
 	  SiS 7018 soundcards.
@@ -110,20 +110,20 @@
 
 config SND_ENS1370
 	tristate "(Creative) Ensoniq AudioPCI 1370"
-	depends on SND && GAMEPORT
+	depends on SND
 	help
 	  Say 'Y' or 'M' to include support for Ensoniq AudioPCI ES1370.
 
 config SND_ENS1371
 	tristate "(Creative) Ensoniq AudioPCI 1371/1373"
-	depends on SND && GAMEPORT
+	depends on SND
 	help
 	  Say 'Y' or 'M' to include support for Ensoniq AudioPCI ES1371 and
 	  Sound Blaster PCI 64 or 128 soundcards.
 
 config SND_ES1938
 	tristate "ESS ES1938/1946/1969 (Solo-1)"
-	depends on SND && GAMEPORT
+	depends on SND
 	help
 	  Say 'Y' or 'M' to include support for ESS Solo-1 (ES1938, ES1946, ES1969)
 	  soundcard.
@@ -173,7 +173,7 @@
 
 config SND_SONICVIBES
 	tristate "S3 SonicVibes"
-	depends on SND && GAMEPORT
+	depends on SND
 	help
 	  Say 'Y' or 'M' to include support for S3 SonicVibes based soundcards.
 

-- 
Muli Ben-Yehuda
http://www.mulix.org


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]