summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-10-20 03:04:34 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-10-20 03:04:34 -0700
commit4896f66ee760fd0c3362b03dadb78dfdfecf44b7 (patch)
treecf9baee3d79625939d194d9eb21f8f22f1c12092 /include
parent178f53128d0286ab532701268e6bf72631f6cb61 (diff)
parentae6d965239be925622f9fa9af7e29d7b44c1b08e (diff)
Merge http://linux-watchdog.bkbits.net/linux-2.6-watchdog
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/arch-s3c2410/regs-watchdog.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/arch-s3c2410/regs-watchdog.h b/include/asm-arm/arch-s3c2410/regs-watchdog.h
index f375d93c89d5..b09d5107a1eb 100644
--- a/include/asm-arm/arch-s3c2410/regs-watchdog.h
+++ b/include/asm-arm/arch-s3c2410/regs-watchdog.h
@@ -38,6 +38,7 @@
#define S3C2410_WTCON_DIV128 (3<<3)
#define S3C2410_WTCON_PRESCALE(x) ((x) << 8)
+#define S3C2410_WTCON_PRESCALE_MASK (0xff00)
#endif /* __ASM_ARCH_REGS_WATCHDOG_H */