---

yaml --- r: 295319 b: refs/heads/master c: 20a7b2c h: refs/heads/master i: 295317: 548f41f 295315: 3c46c0b 295311: 1f9893c v: v3
git-mirror · Jan 20, 2012 · 6e7bd90 · 6e7bd90
1 parent 7ba06fb
commit 6e7bd90
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 460863ac23097dde81f101231595518821344a9a
+refs/heads/master: 20a7b2c15171522d7c5005ff6d4aa1a0e8581e79
diff --git a/trunk/arch/arm/mach-s5pc100/common.c b/trunk/arch/arm/mach-s5pc100/common.c
@@ -129,14 +129,6 @@ static struct map_desc s5pc100_iodesc[] __initdata = {
 	}
 };
 
-static void s5pc100_idle(void)
-{
-	if (!need_resched())
-		cpu_do_idle();
-
-	local_irq_enable();
-}
-
 /*
  * s5pc100_map_io
  *
@@ -210,10 +202,6 @@ core_initcall(s5pc100_core_init);
 int __init s5pc100_init(void)
 {
 	printk(KERN_INFO "S5PC100: Initializing architecture\n");
-
-	/* set idle function */
-	pm_idle = s5pc100_idle;
-
 	return device_register(&s5pc100_dev);
 }
 

diff --git a/trunk/arch/arm/mach-s5pc100/include/mach/system.h b/trunk/arch/arm/mach-s5pc100/include/mach/system.h
@@ -13,7 +13,7 @@
 
 static void arch_idle(void)
 {
-	/* nothing here yet */
+	cpu_do_idle();
 }
 
 #endif /* __ASM_ARCH_IRQ_H */