diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 10:49:47 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 10:49:47 +0100 |
| commit | 59136ef3c596606d3eef920dc3e0fdfa2ce52c6f (patch) | |
| tree | 3f3b8ec46d57bcb61a2d794a1f21bd4df01728c9 /arch/arm/mach-iop32x | |
| parent | ARM: restart: only perform setup for restart when soft-restarting (diff) | |
| parent | ARM: restart: remove poodle restart handler (diff) | |
| download | linux-59136ef3c596606d3eef920dc3e0fdfa2ce52c6f.tar.xz linux-59136ef3c596606d3eef920dc3e0fdfa2ce52c6f.zip | |
Merge branch 'restart-cleanup' into restart
Diffstat (limited to 'arch/arm/mach-iop32x')
| -rw-r--r-- | arch/arm/mach-iop32x/include/mach/system.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-iop32x/include/mach/system.h b/arch/arm/mach-iop32x/include/mach/system.h index 4865a9bff85e..b4f83e5973b2 100644 --- a/arch/arm/mach-iop32x/include/mach/system.h +++ b/arch/arm/mach-iop32x/include/mach/system.h @@ -18,8 +18,6 @@ static inline void arch_idle(void) static inline void arch_reset(char mode, const char *cmd) { - local_irq_disable(); - if (machine_is_n2100()) { gpio_line_set(N2100_HARDWARE_RESET, GPIO_LOW); gpio_line_config(N2100_HARDWARE_RESET, GPIO_OUT); |