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/m68k/mac | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'arch/m68k/mac')
| -rw-r--r-- | arch/m68k/mac/misc.c | 2 | ||||
| -rw-r--r-- | arch/m68k/mac/oss.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c index d6065716a..afc769d42 100644 --- a/arch/m68k/mac/misc.c +++ b/arch/m68k/mac/misc.c @@ -10,7 +10,7 @@ #include <linux/kernel.h> #include <linux/delay.h> #include <linux/sched.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/time.h> #include <linux/kd.h> #include <linux/mm.h> diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c index 87d155ee0..f39171648 100644 --- a/arch/m68k/mac/oss.c +++ b/arch/m68k/mac/oss.c @@ -123,7 +123,7 @@ void oss_irq(int irq, void *dev_id, struct pt_regs *regs) /* * Nubus IRQ handler, OSS style * - * Unlike the VIA/RBV this is on its own autovector interupt level. + * Unlike the VIA/RBV this is on its own autovector interrupt level. */ void oss_nubus_irq(int irq, void *dev_id, struct pt_regs *regs) |