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/sbus/char/vfc_dev.c | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'drivers/sbus/char/vfc_dev.c')
| -rw-r--r-- | drivers/sbus/char/vfc_dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c index a4c0f347e..c395c018a 100644 --- a/drivers/sbus/char/vfc_dev.c +++ b/drivers/sbus/char/vfc_dev.c @@ -17,11 +17,12 @@ #include <linux/module.h> #include <linux/kernel.h> #include <linux/string.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/errno.h> #include <linux/sched.h> #include <linux/fs.h> #include <linux/smp_lock.h> +#include <linux/delay.h> #include <linux/spinlock.h> #include <asm/openprom.h> @@ -29,7 +30,6 @@ #include <asm/io.h> #include <asm/system.h> #include <asm/sbus.h> -#include <asm/delay.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/uaccess.h> |