summaryrefslogtreecommitdiffstats
path: root/drivers/char/wdt977.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-10-05 01:18:40 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-10-05 01:18:40 +0000
commit012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch)
tree87efc733f9b164e8c85c0336f92c8fb7eff6d183 /drivers/char/wdt977.c
parent625a1589d3d6464b5d90b8a0918789e3afffd220 (diff)
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found that this kernel will only boot SMP on Origin; the UP kernel freeze soon after bootup with SCSI timeout messages. I commit this anyway since I found that the last CVS versions had the same problem.
Diffstat (limited to 'drivers/char/wdt977.c')
-rw-r--r--drivers/char/wdt977.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/wdt977.c b/drivers/char/wdt977.c
index fef6bc7fc..d9ea545a7 100644
--- a/drivers/char/wdt977.c
+++ b/drivers/char/wdt977.c
@@ -24,6 +24,7 @@
#include <asm/io.h>
#include <asm/system.h>
+#include <asm/mach-types.h>
#define WATCHDOG_MINOR 130