summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mga_vid.c6
-rw-r--r--drivers/sis_vid.c6
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/mga_vid.c b/drivers/mga_vid.c
index eca74c5e64..655bdd7a9f 100644
--- a/drivers/mga_vid.c
+++ b/drivers/mga_vid.c
@@ -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>
diff --git a/drivers/sis_vid.c b/drivers/sis_vid.c
index 425376905a..9f5d2c3ee5 100644
--- a/drivers/sis_vid.c
+++ b/drivers/sis_vid.c
@@ -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>