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/sparc64/kernel/sbus.c | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'arch/sparc64/kernel/sbus.c')
| -rw-r--r-- | arch/sparc64/kernel/sbus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c index 7baebc89e..30cac5e00 100644 --- a/arch/sparc64/kernel/sbus.c +++ b/arch/sparc64/kernel/sbus.c @@ -1,4 +1,4 @@ -/* $Id: sbus.c,v 1.12 2000/09/21 06:25:14 anton Exp $ +/* $Id: sbus.c,v 1.13 2001/02/13 01:16:44 davem Exp $ * sbus.c: UltraSparc SBUS controller support. * * Copyright (C) 1999 David S. Miller (davem@redhat.com) @@ -8,7 +8,7 @@ #include <linux/types.h> #include <linux/mm.h> #include <linux/spinlock.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/init.h> #include <asm/page.h> |