summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-11-21 10:49:47 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-11-21 10:49:47 +0100
commit59136ef3c596606d3eef920dc3e0fdfa2ce52c6f (patch)
tree3f3b8ec46d57bcb61a2d794a1f21bd4df01728c9 /arch/arm/mach-u300
parentARM: restart: only perform setup for restart when soft-restarting (diff)
parentARM: restart: remove poodle restart handler (diff)
downloadlinux-59136ef3c596606d3eef920dc3e0fdfa2ce52c6f.tar.xz
linux-59136ef3c596606d3eef920dc3e0fdfa2ce52c6f.zip
Merge branch 'restart-cleanup' into restart
Diffstat (limited to 'arch/arm/mach-u300')
-rw-r--r--arch/arm/mach-u300/include/mach/system.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-u300/include/mach/system.h b/arch/arm/mach-u300/include/mach/system.h
index 8daf13634ce0..6b6fef7a438c 100644
--- a/arch/arm/mach-u300/include/mach/system.h
+++ b/arch/arm/mach-u300/include/mach/system.h
@@ -27,8 +27,6 @@ static void arch_reset(char mode, const char *cmd)
case 's':
case 'h':
printk(KERN_CRIT "RESET: shutting down/rebooting system\n");
- /* Disable interrupts */
- local_irq_disable();
#ifdef CONFIG_COH901327_WATCHDOG
coh901327_watchdog_reset();
#endif