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/char/dz.c | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'drivers/char/dz.c')
| -rw-r--r-- | drivers/char/dz.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/dz.c b/drivers/char/dz.c index 9c0afa2c6..a97d8a694 100644 --- a/drivers/char/dz.c +++ b/drivers/char/dz.c @@ -33,7 +33,7 @@ #include <linux/kernel.h> #include <linux/sched.h> #include <linux/init.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/major.h> #include <linux/param.h> @@ -230,7 +230,7 @@ static inline void receive_chars (struct dz_serial *info_in) ch = UCHAR(status); /* grab the char */ -#ifdef 0 +#if 0 if (info->is_console) { if (ch == 0) return; /* it's a break ... */ |