Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv28241/alsa-kernel/pci
Modified Files:
ens1370.c
Log Message:
- sync with the 2.6 tree (imajor, iminor)
- fixed firmware ioctls for sscape and hdsp drivers (ioctl out of range)
Index: ens1370.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ens1370.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ens1370.c 15 Sep 2003 07:38:00 -0000 1.49
+++ ens1370.c 25 Sep 2003 18:55:43 -0000 1.50
@@ -47,6 +47,13 @@
#define CHIP1370
#endif
+#ifdef CHIP1370
+#define DRIVER_NAME "ENS1370"
+#else
+#define DRIVER_NAME "ENS1371"
+#endif
+
+
MODULE_AUTHOR("Jaroslav Kysela <[EMAIL PROTECTED]>, Thomas Sailer <[EMAIL
PROTECTED]>");
MODULE_LICENSE("GPL");
MODULE_CLASSES("{sound}");
@@ -2324,12 +2331,8 @@
snd_card_free(card);
return err;
}
-#ifdef CHIP1370
- strcpy(card->driver, "ENS1370");
-#endif
-#ifdef CHIP1371
- strcpy(card->driver, "ENS1371");
-#endif
+ strcpy(card->driver, DRIVER_NAME);
+
strcpy(card->shortname, "Ensoniq AudioPCI");
sprintf(card->longname, "%s %s at 0x%lx, irq %i",
card->shortname,
@@ -2354,11 +2357,7 @@
}
static struct pci_driver driver = {
-#ifdef CHIP1371
- .name = "Ensoniq 1371+",
-#else
- .name = "Ensoniq 1370",
-#endif
+ .name = DRIVER_NAME,
.id_table = snd_audiopci_ids,
.probe = snd_audiopci_probe,
.remove = __devexit_p(snd_audiopci_remove),
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
