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 /arch/mips/baget | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'arch/mips/baget')
| -rw-r--r-- | arch/mips/baget/irq.c | 2 | ||||
| -rw-r--r-- | arch/mips/baget/vacserial.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/baget/irq.c b/arch/mips/baget/irq.c index 2fd91c9c9..3a7e9b177 100644 --- a/arch/mips/baget/irq.c +++ b/arch/mips/baget/irq.c @@ -14,7 +14,7 @@ #include <linux/interrupt.h> #include <linux/ioport.h> #include <linux/timex.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/random.h> #include <linux/delay.h> diff --git a/arch/mips/baget/vacserial.c b/arch/mips/baget/vacserial.c index 12021daf4..61e459dfe 100644 --- a/arch/mips/baget/vacserial.c +++ b/arch/mips/baget/vacserial.c @@ -56,7 +56,7 @@ #include <linux/ptrace.h> #include <linux/ioport.h> #include <linux/mm.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/init.h> #include <linux/delay.h> #ifdef CONFIG_SERIAL_CONSOLE |