diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:24:33 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:24:33 +0000 |
| commit | 2e0e943436912ffe0848ece58167edfe754edb96 (patch) | |
| tree | b91919095c74742fa06e2105db6d859bee39b2b4 /arch/arm/mach-shark/core.c | |
| parent | a32737e1ca650504f172292dd344eb64c02311f3 (diff) | |
| parent | ef3a0bf5bfadbace156fa2a3b9c753df2de41df2 (diff) | |
| download | op-kernel-dev-2e0e943436912ffe0848ece58167edfe754edb96.zip op-kernel-dev-2e0e943436912ffe0848ece58167edfe754edb96.tar.gz | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
Diffstat (limited to 'arch/arm/mach-shark/core.c')
| -rw-r--r-- | arch/arm/mach-shark/core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c index feda3ca..f4b25d8 100644 --- a/arch/arm/mach-shark/core.c +++ b/arch/arm/mach-shark/core.c @@ -29,7 +29,6 @@ void arch_reset(char mode, const char *cmd) { short temp; - local_irq_disable(); /* Reset the Machine via pc[3] of the sequoia chipset */ outw(0x09,0x24); temp=inw(0x26); |
