diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-12-07 12:03:13 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-12-07 12:03:13 +0100 |
| commit | 0ee6847f7b6d396d3756f6ecd0781a00b9cca980 (patch) | |
| tree | 1f1bed639ac0bbc9091685538c791b4648f4c342 /arch/nios2/cpu/cpu.c | |
| parent | 61b62f6d33d55c9b89ba8a6fbae84cb9c33e342a (diff) | |
| parent | 8b3d10265da20b8be6138799cee704d53dee1c63 (diff) | |
| download | barebox-0ee6847f7b6d396d3756f6ecd0781a00b9cca980.tar.gz barebox-0ee6847f7b6d396d3756f6ecd0781a00b9cca980.tar.xz | |
Merge branch 'next'
Diffstat (limited to 'arch/nios2/cpu/cpu.c')
| -rw-r--r-- | arch/nios2/cpu/cpu.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c index 102b12e06f..44ddf3ccd3 100644 --- a/arch/nios2/cpu/cpu.c +++ b/arch/nios2/cpu/cpu.c @@ -26,9 +26,6 @@ void __noreturn reset_cpu(ulong ignored) { -#ifdef CONFIG_USE_IRQ - disable_interrupts(); -#endif /* indirect call to go beyond 256MB limitation of toolchain */ nios2_callr(RESET_ADDR); |