[Mplayer-cvslog] CVS: main/drivers mga_vid.c,1.28,1.29 sis_vid.c,1.2,1.3

[Szabolcs Berecz]

Update of /cvsroot/mplayer/main/drivers
In directory mplayer:/var/tmp.root/cvs-serv28328

Modified Files:
	mga_vid.c sis_vid.c 
Log Message:
use <linux/slab.h> instead of <linux/malloc.h> for kernels 2.4.9+

Index: mga_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/drivers/mga_vid.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mga_vid.c	21 Oct 2001 17:30:28 -0000	1.28
+++ mga_vid.c	25 Nov 2001 23:34:37 -0000	1.29
@@ -39,7 +39,13 @@
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/errno.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,10)
 #include <linux/malloc.h>
+#else
+#include <linux/slab.h>
+#endif
+
 #include <linux/pci.h>
 #include <linux/ioport.h>
 #include <linux/init.h>

Index: sis_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/drivers/sis_vid.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sis_vid.c	9 Mar 2001 00:42:27 -0000	1.2
+++ sis_vid.c	25 Nov 2001 23:34:37 -0000	1.3
@@ -23,7 +23,13 @@
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/errno.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,10)
 #include <linux/malloc.h>
+#else
+#include <linux/slab.h>
+#endif
+
 #include <linux/pci.h>
 #include <linux/init.h>
 //#include <linux/videodev.h>