diff options
| author | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-23 18:01:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 19:58:31 -0400 |
| commit | d314d74c695f967e10598467a326f41c78ed1e20 (patch) | |
| tree | 71fabe9cf1f2b99f16f7f9cc3f809955038a2d0c /arch/mn10300/include | |
| parent | b502bd1152472dc1b98c60434f23c23b280c7b94 (diff) | |
nmi watchdog: do not use cpp symbol in Kconfig
ARCH_HAS_NMI_WATCHDOG is a macro defined by arch, but config
HARDLOCKUP_DETECTOR depends on it. This is wrong, ARCH_HAS_NMI_WATCHDOG
has to be a Kconfig config, and arch's need it should select it
explicitly.
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Acked-by: Don Zickus <dzickus@redhat.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Cc: David Howells <dhowells@redhat.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/mn10300/include')
| -rw-r--r-- | arch/mn10300/include/asm/reset-regs.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/mn10300/include/asm/reset-regs.h b/arch/mn10300/include/asm/reset-regs.h index 10c7502a113f..8ca2a42d365b 100644 --- a/arch/mn10300/include/asm/reset-regs.h +++ b/arch/mn10300/include/asm/reset-regs.h | |||
| @@ -17,10 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #ifdef __KERNEL__ | 18 | #ifdef __KERNEL__ |
| 19 | 19 | ||
| 20 | #ifdef CONFIG_MN10300_WD_TIMER | ||
| 21 | #define ARCH_HAS_NMI_WATCHDOG /* See include/linux/nmi.h */ | ||
| 22 | #endif | ||
| 23 | |||
| 24 | /* | 20 | /* |
| 25 | * watchdog timer registers | 21 | * watchdog timer registers |
| 26 | */ | 22 | */ |