Update of /cvsroot/alsa/alsa-driver/isa
In directory usw-pr-cvs1:/tmp/cvs-serv6318/isa
Modified Files:
sscape.c
Log Message:
fixed isapnp stuff for 2.2 kernel.
Index: sscape.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/isa/sscape.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sscape.c 29 Sep 2002 17:13:48 -0000 1.5
+++ sscape.c 4 Oct 2002 12:45:16 -0000 1.6
@@ -28,7 +28,11 @@
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/delay.h>
+#ifndef LINUX_ISAPNP_H
#include <linux/isapnp.h>
+#define isapnp_card pci_bus
+#define isapnp_dev pci_dev
+#endif
#include <linux/spinlock.h>
#include <asm/dma.h>
#include <sound/core.h>
@@ -465,7 +469,9 @@
* board through the DMA channel ...
*/
while (size != 0) {
- register unsigned long len = min(size, dma.size);
+ unsigned long len;
+
+ len = size < dma.size ? size : dma.size;
/*
* Remember that the data that we want to DMA
@@ -1239,9 +1245,9 @@
#ifdef MODULE
-static int __init sscape_module_probe(struct pci_bus *card, const struct
isapnp_card_id *id)
+static int __init sscape_module_probe(struct isapnp_card *card, const struct
+isapnp_card_id *id)
{
- struct pci_dev *dev;
+ struct isapnp_dev *dev;
int ret = -ENODEV;
/*
-------------------------------------------------------
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
