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/gt64120 | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'arch/mips/gt64120')
| -rw-r--r-- | arch/mips/gt64120/common/irq.c | 2 | ||||
| -rw-r--r-- | arch/mips/gt64120/common/pci.c | 2 | ||||
| -rw-r--r-- | arch/mips/gt64120/momenco_ocelot/irq.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/gt64120/common/irq.c b/arch/mips/gt64120/common/irq.c index c0fdcc44a..5192dfa1e 100644 --- a/arch/mips/gt64120/common/irq.c +++ b/arch/mips/gt64120/common/irq.c @@ -41,7 +41,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/irq.h> #include <asm/bitops.h> diff --git a/arch/mips/gt64120/common/pci.c b/arch/mips/gt64120/common/pci.c index d6b647e11..e74b86bd6 100644 --- a/arch/mips/gt64120/common/pci.c +++ b/arch/mips/gt64120/common/pci.c @@ -39,7 +39,7 @@ #include <linux/types.h> #include <linux/pci.h> #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/version.h> #include <asm/pci.h> #include <asm/io.h> diff --git a/arch/mips/gt64120/momenco_ocelot/irq.c b/arch/mips/gt64120/momenco_ocelot/irq.c index 8d832aadb..407031e6a 100644 --- a/arch/mips/gt64120/momenco_ocelot/irq.c +++ b/arch/mips/gt64120/momenco_ocelot/irq.c @@ -37,7 +37,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/irq.h> #include <asm/bitops.h> |