Update of /cvsroot/alsa/alsa-kernel/pci/cs46xx
In directory sc8-pr-cvs1:/tmp/cvs-serv9811/cs46xx
Modified Files:
cs46xx_lib.c
Log Message:
added conditional for gameport support.
Index: cs46xx_lib.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/cs46xx/cs46xx_lib.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- cs46xx_lib.c 10 Dec 2002 15:18:28 -0000 1.39
+++ cs46xx_lib.c 19 Dec 2002 16:26:30 -0000 1.40
@@ -52,14 +52,12 @@
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
+#include <linux/gameport.h>
#include <sound/core.h>
#include <sound/control.h>
#include <sound/info.h>
#include <sound/cs46xx.h>
-#ifndef LINUX_2_2
-#include <linux/gameport.h>
-#endif
#include <asm/io.h>
@@ -2740,7 +2738,7 @@
* gameport interface
*/
-#ifndef LINUX_2_2
+#if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
typedef struct snd_cs46xx_gameport {
struct gameport info;
@@ -2824,13 +2822,13 @@
gameport_register_port(&gp->info);
}
-#else /* LINUX_2_2 */
+#else
void __devinit snd_cs46xx_gameport(cs46xx_t *chip)
{
}
-#endif /* !LINUX_2_2 */
+#endif /* CONFIG_GAMEPORT */
/*
* proc interface
@@ -2972,7 +2970,7 @@
if (chip->active_ctrl)
chip->active_ctrl(chip, 1);
-#ifndef LINUX_2_2
+#if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
if (chip->gameport) {
gameport_unregister_port(&chip->gameport->info);
kfree(chip->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
