From 6e7bd90dc36a21384b966a68abcc27304e7ce234 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nicolas.pitre@linaro.org>
Date: Fri, 16 Dec 2011 23:13:28 -0500
Subject: [PATCH] --- yaml --- r: 295319 b: refs/heads/master c:
 20a7b2c15171522d7c5005ff6d4aa1a0e8581e79 h: refs/heads/master i:   295317:
 548f41fc5541b3427e67b62530a51768bbc1777a   295315:
 3c46c0b48806199e05dc7f75ad4b3c499e562a4d   295311:
 1f9893cb469588534a4414008a6ca02b6ad8a2e7 v: v3

---
 [refs]                                            |  2 +-
 trunk/arch/arm/mach-s5pc100/common.c              | 12 ------------
 trunk/arch/arm/mach-s5pc100/include/mach/system.h |  2 +-
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index a2ab2c1cc44a..a2d265f32d4b 100644
--- 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
index c9095730a7f5..ff71e2d467c6 100644
--- 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
index afc96c298518..a09cff95764a 100644
--- 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 */