diff options
| author | szabi <szabi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-25 23:34:37 +0000 |
|---|---|---|
| committer | szabi <szabi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-25 23:34:37 +0000 |
| commit | 8188f8359cc532987eb1152e288d2e66301eb910 (patch) | |
| tree | 24051630b67b2b9f398ac88cc8100d594b2ede72 /drivers | |
| parent | bf84d64dfa684bcfc81350e53438e45af64e141e (diff) | |
| download | mpv-8188f8359cc532987eb1152e288d2e66301eb910.tar.bz2 mpv-8188f8359cc532987eb1152e288d2e66301eb910.tar.xz | |
use <linux/slab.h> instead of <linux/malloc.h> for kernels 2.4.9+
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3126 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mga_vid.c | 6 | ||||
| -rw-r--r-- | drivers/sis_vid.c | 6 |
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> |