Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[~andy/linux] / arch / cris / arch-v10 / kernel / process.c

diff --git a/arch/cris/arch-v10/kernel/process.c b/arch/cris/arch-v10/kernel/process.c
index 753e9a03cf870565bb4ba0619a3b529e1b9a430d..02b783457be0a92a0e346f21675f0f06b59b4288 100644 (file)
--- a/arch/cris/arch-v10/kernel/process.c
+++ b/arch/cris/arch-v10/kernel/process.c
@@ -56,14 +56,14 @@ void hard_reset_now (void)
         * code to know about it than the watchdog handler in entry.S and
         * this code, implementing hard reset through the watchdog.
         */
-#if defined(CONFIG_ETRAX_WATCHDOG) && !defined(CONFIG_SVINTO_SIM)
+#if defined(CONFIG_ETRAX_WATCHDOG)
        extern int cause_of_death;
 #endif
 
        printk("*** HARD RESET ***\n");
        local_irq_disable();
 
-#if defined(CONFIG_ETRAX_WATCHDOG) && !defined(CONFIG_SVINTO_SIM)
+#if defined(CONFIG_ETRAX_WATCHDOG)
        cause_of_death = 0xbedead;
 #else
        /* Since we dont plan to keep on resetting the watchdog,