From 116674acc97ba75a720329996877077d988443a2 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 9 Mar 2001 20:33:35 +0000
Subject: Merge with Linux 2.4.2.

---
 drivers/char/dz.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'drivers/char/dz.c')

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 ... */
 
-- 
cgit v1.2.3