diff options
author | David Dawes <dawes@xfree86.org> | 2002-01-27 20:05:42 +0000 |
---|---|---|
committer | David Dawes <dawes@xfree86.org> | 2002-01-27 20:05:42 +0000 |
commit | 44aa4d6297874022a4f5a49ea24f2d052584d3dc (patch) | |
tree | a3b8646dd51527d2fb246dbc11a124f4fd60968a /linux/sis_ds.c | |
parent | 14945ada16218e9f918c24e0d702979fae9b07f6 (diff) |
First pass merge of XFree86 4.2.0 import.
Diffstat (limited to 'linux/sis_ds.c')
-rw-r--r-- | linux/sis_ds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/sis_ds.c b/linux/sis_ds.c index 6143ad83..95880a48 100644 --- a/linux/sis_ds.c +++ b/linux/sis_ds.c @@ -33,7 +33,7 @@ #include <linux/delay.h> #include <linux/errno.h> #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/poll.h> #include <asm/io.h> #include <linux/pci.h> |