Update of /cvsroot/alsa/alsa-kernel/pci/trident
In directory sc8-pr-cvs1:/tmp/cvs-serv9811/trident
Modified Files:
trident_main.c
Log Message:
added conditional for gameport support.
Index: trident_main.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/trident/trident_main.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- trident_main.c 19 Nov 2002 17:22:03 -0000 1.19
+++ trident_main.c 19 Dec 2002 16:26:30 -0000 1.20
@@ -34,15 +34,13 @@
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
+#include <linux/gameport.h>
#include <sound/core.h>
#include <sound/info.h>
#include <sound/control.h>
#include <sound/trident.h>
#include <sound/asoundef.h>
-#ifndef LINUX_2_2
-#include <linux/gameport.h>
-#endif
#include <asm/io.h>
@@ -2987,7 +2985,7 @@
/*
* gameport interface
*/
-#ifndef LINUX_2_2
+#if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
typedef struct snd_trident_gameport {
struct gameport info;
@@ -3076,7 +3074,7 @@
void __devinit snd_trident_gameport(trident_t *chip)
{
}
-#endif
+#endif /* CONFIG_GAMEPORT */
/*
* SiS reset routine
@@ -3482,7 +3480,7 @@
int snd_trident_free(trident_t *trident)
{
-#ifndef LINUX_2_2
+#if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
if (trident->gameport) {
gameport_unregister_port(&trident->gameport->info);
kfree(trident->gameport);
-------------------------------------------------------
This SF.NET email is sponsored by: Geek Gift Procrastinating?
Get the perfect geek gift now! Before the Holidays pass you by.
T H I N K G E E K . C O M http://www.thinkgeek.com/sf/
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
