Update of /cvsroot/alsa/alsa-driver/acore
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6801
Modified Files:
memory_wrapper.c pci_compat_22.c
Log Message:
prevent use of unwanted wrapper function from snd.o
Index: memory_wrapper.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/memory_wrapper.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- memory_wrapper.c 6 Mar 2004 16:55:12 -0000 1.11
+++ memory_wrapper.c 31 Mar 2004 16:07:09 -0000 1.12
@@ -10,6 +10,14 @@
#endif
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0)
+#include <linux/ioport.h>
+static inline void snd_memory_wrapper_request_region(unsigned long from, unsigned
long extent, const char *name)
+{
+ request_region(from, extent, name);
+}
+#endif
+
#include "config.h"
#include "adriver.h"
#include <linux/mm.h>
Index: pci_compat_22.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/pci_compat_22.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pci_compat_22.c 29 Mar 2004 12:23:48 -0000 1.12
+++ pci_compat_22.c 31 Mar 2004 16:07:09 -0000 1.13
@@ -315,8 +315,8 @@
if (flags & IORESOURCE_IO) {
if (check_region(pci_resource_start(pdev, bar), pci_resource_len(pdev,
bar)))
goto err_out;
- request_region(pci_resource_start(pdev, bar),
- pci_resource_len(pdev, bar), res_name);
+ snd_memory_wrapper_request_region(pci_resource_start(pdev, bar),
+ pci_resource_len(pdev, bar),
res_name);
}
return 0;
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
