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/wdt.c | |
parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) |
Merge with Linux 2.4.2.
Diffstat (limited to 'drivers/char/wdt.c')
-rw-r--r-- | drivers/char/wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/wdt.c b/drivers/char/wdt.c index 9600a5b17..0da4f4241 100644 --- a/drivers/char/wdt.c +++ b/drivers/char/wdt.c @@ -40,7 +40,7 @@ #include <linux/miscdevice.h> #include <linux/watchdog.h> #include "wd501p.h" -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/ioport.h> #include <linux/fcntl.h> #include <asm/io.h> |