diff options
-rw-r--r-- | arch/mips/ar7/setup.c | 1 | ||||
-rw-r--r-- | arch/mips/emma/markeins/setup.c | 3 | ||||
-rw-r--r-- | arch/mips/netlogic/xlp/setup.c | 1 | ||||
-rw-r--r-- | arch/mips/netlogic/xlr/setup.c | 1 | ||||
-rw-r--r-- | arch/mips/sibyte/swarm/setup.c | 2 |
5 files changed, 0 insertions, 8 deletions
diff --git a/arch/mips/ar7/setup.c b/arch/mips/ar7/setup.c index 9a357fffcfbe..820b7a313d9b 100644 --- a/arch/mips/ar7/setup.c +++ b/arch/mips/ar7/setup.c | |||
@@ -92,7 +92,6 @@ void __init plat_mem_setup(void) | |||
92 | _machine_restart = ar7_machine_restart; | 92 | _machine_restart = ar7_machine_restart; |
93 | _machine_halt = ar7_machine_halt; | 93 | _machine_halt = ar7_machine_halt; |
94 | pm_power_off = ar7_machine_power_off; | 94 | pm_power_off = ar7_machine_power_off; |
95 | panic_timeout = 3; | ||
96 | 95 | ||
97 | io_base = (unsigned long)ioremap(AR7_REGS_BASE, 0x10000); | 96 | io_base = (unsigned long)ioremap(AR7_REGS_BASE, 0x10000); |
98 | if (!io_base) | 97 | if (!io_base) |
diff --git a/arch/mips/emma/markeins/setup.c b/arch/mips/emma/markeins/setup.c index d71005835c00..9100122e5cef 100644 --- a/arch/mips/emma/markeins/setup.c +++ b/arch/mips/emma/markeins/setup.c | |||
@@ -111,9 +111,6 @@ void __init plat_mem_setup(void) | |||
111 | iomem_resource.start = EMMA2RH_IO_BASE; | 111 | iomem_resource.start = EMMA2RH_IO_BASE; |
112 | iomem_resource.end = EMMA2RH_ROM_BASE - 1; | 112 | iomem_resource.end = EMMA2RH_ROM_BASE - 1; |
113 | 113 | ||
114 | /* Reboot on panic */ | ||
115 | panic_timeout = 180; | ||
116 | |||
117 | markeins_sio_setup(); | 114 | markeins_sio_setup(); |
118 | } | 115 | } |
119 | 116 | ||
diff --git a/arch/mips/netlogic/xlp/setup.c b/arch/mips/netlogic/xlp/setup.c index 6d981bb337ec..54e75c77184b 100644 --- a/arch/mips/netlogic/xlp/setup.c +++ b/arch/mips/netlogic/xlp/setup.c | |||
@@ -92,7 +92,6 @@ static void __init xlp_init_mem_from_bars(void) | |||
92 | 92 | ||
93 | void __init plat_mem_setup(void) | 93 | void __init plat_mem_setup(void) |
94 | { | 94 | { |
95 | panic_timeout = 5; | ||
96 | _machine_restart = (void (*)(char *))nlm_linux_exit; | 95 | _machine_restart = (void (*)(char *))nlm_linux_exit; |
97 | _machine_halt = nlm_linux_exit; | 96 | _machine_halt = nlm_linux_exit; |
98 | pm_power_off = nlm_linux_exit; | 97 | pm_power_off = nlm_linux_exit; |
diff --git a/arch/mips/netlogic/xlr/setup.c b/arch/mips/netlogic/xlr/setup.c index 214d123b79fa..921be5f77797 100644 --- a/arch/mips/netlogic/xlr/setup.c +++ b/arch/mips/netlogic/xlr/setup.c | |||
@@ -92,7 +92,6 @@ static void nlm_linux_exit(void) | |||
92 | 92 | ||
93 | void __init plat_mem_setup(void) | 93 | void __init plat_mem_setup(void) |
94 | { | 94 | { |
95 | panic_timeout = 5; | ||
96 | _machine_restart = (void (*)(char *))nlm_linux_exit; | 95 | _machine_restart = (void (*)(char *))nlm_linux_exit; |
97 | _machine_halt = nlm_linux_exit; | 96 | _machine_halt = nlm_linux_exit; |
98 | pm_power_off = nlm_linux_exit; | 97 | pm_power_off = nlm_linux_exit; |
diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c index 41707a245dea..3462c831d0ea 100644 --- a/arch/mips/sibyte/swarm/setup.c +++ b/arch/mips/sibyte/swarm/setup.c | |||
@@ -134,8 +134,6 @@ void __init plat_mem_setup(void) | |||
134 | #error invalid SiByte board configuration | 134 | #error invalid SiByte board configuration |
135 | #endif | 135 | #endif |
136 | 136 | ||
137 | panic_timeout = 5; /* For debug. */ | ||
138 | |||
139 | board_be_handler = swarm_be_handler; | 137 | board_be_handler = swarm_be_handler; |
140 | 138 | ||
141 | if (xicor_probe()) | 139 | if (xicor_probe()) |