diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
| commit | 116674acc97ba75a720329996877077d988443a2 (patch) | |
| tree | 6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /drivers/sgi/char | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'drivers/sgi/char')
| -rw-r--r-- | drivers/sgi/char/ds1286.c | 2 | ||||
| -rw-r--r-- | drivers/sgi/char/graphics.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sgi/char/ds1286.c b/drivers/sgi/char/ds1286.c index ce6b12845..5de2dee45 100644 --- a/drivers/sgi/char/ds1286.c +++ b/drivers/sgi/char/ds1286.c @@ -29,7 +29,7 @@ #include <linux/types.h> #include <linux/errno.h> #include <linux/miscdevice.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/ioport.h> #include <linux/fcntl.h> #include <linux/init.h> diff --git a/drivers/sgi/char/graphics.c b/drivers/sgi/char/graphics.c index 46f940243..24c6fbaae 100644 --- a/drivers/sgi/char/graphics.c +++ b/drivers/sgi/char/graphics.c @@ -31,7 +31,7 @@ #include <linux/sched.h> #include <linux/mm.h> #include <linux/mman.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/module.h> #include <linux/smp_lock.h> #include <asm/uaccess.h> |