aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-h720x/system.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-04 15:57:53 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-04 15:57:53 -0700
commit50165d8b1d915422343079f79a878a0f7572feaa (patch)
tree55358d0e902b34c6d45f73afb16310e686212669 /include/asm-arm/arch-h720x/system.h
parent944d2647dded12e2b05ad8ebc020644bb1997ce1 (diff)
parentc2f480869fa7559fa3532e415e3e3ec49339f208 (diff)
downloadkernel_samsung_smdk4412-50165d8b1d915422343079f79a878a0f7572feaa.zip
kernel_samsung_smdk4412-50165d8b1d915422343079f79a878a0f7572feaa.tar.gz
kernel_samsung_smdk4412-50165d8b1d915422343079f79a878a0f7572feaa.tar.bz2
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-h720x/system.h')
-rw-r--r--include/asm-arm/arch-h720x/system.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-arm/arch-h720x/system.h b/include/asm-arm/arch-h720x/system.h
index 0b025e2..09eda84 100644
--- a/include/asm-arm/arch-h720x/system.h
+++ b/include/asm-arm/arch-h720x/system.h
@@ -17,9 +17,11 @@
static void arch_idle(void)
{
CPU_REG (PMU_BASE, PMU_MODE) = PMU_MODE_IDLE;
- __asm__ __volatile__(
- "mov r0, r0\n\t"
- "mov r0, r0");
+ nop();
+ nop();
+ CPU_REG (PMU_BASE, PMU_MODE) = PMU_MODE_RUN;
+ nop();
+ nop();
}