--- a/kernel/eka/kernel/power.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kernel/eka/kernel/power.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1998-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of the License "Eclipse Public License v1.0"
@@ -194,7 +194,7 @@
 // Called in CS
 void DPowerManager::AppendHandler(DPowerHandler* aPh)
 	{ // called by drivers (power handler)
-	__KTRACE_OPT(KPOWER,Kern::Printf("PowerManger::AppendHandler('%S')", &aPh->iName));
+	__KTRACE_OPT(KPOWER,Kern::Printf("PowerManger::AppendHandler('%lS')", &aPh->iName));
 	__ASSERT_CRITICAL;
 	//Check to ensure that handler is not added multiple times and not part of any other list
 	__PM_ASSERT(!(aPh->iPrev) && !(aPh->iNext));
@@ -220,7 +220,7 @@
 // Called in CS
 void DPowerManager::RemoveHandler(DPowerHandler* aPh)
 	{ // called by drivers (power handler)
-	__KTRACE_OPT(KPOWER,Kern::Printf("PowerManger::RemoveHandler('%S')", &aPh->iName));
+	__KTRACE_OPT(KPOWER,Kern::Printf("PowerManger::RemoveHandler('%lS')", &aPh->iName));
 	__ASSERT_CRITICAL;
 	Lock();
 	__PM_ASSERT(aPh);
@@ -529,7 +529,7 @@
 	iStatus |= EDone;
 #endif
 	NKern::Lock();
-	__KTRACE_OPT(KPOWER,Kern::Printf("DPowerHandler::Done('%S') sem=0x%x", &iName, iSem));
+	__KTRACE_OPT(KPOWER,Kern::Printf("DPowerHandler::Done('%lS') sem=0x%x", &iName, iSem));
 	NFastSemaphore* sem = (NFastSemaphore*)__e32_atomic_swp_ord_ptr(&iSem, 0);
 	if (sem)
 		sem->Signal();
@@ -666,9 +666,7 @@
     iResourceControllerData.iResourceController = aController;
     //Store the client Id generated by Resource controller for Power controller to use.
     iResourceControllerData.iClientId = aClientId;
-	
-	// Perform variant specific operations e.g. trigger registration of resources for idle with Resource Manager
-    return DoRegisterResourceController();
+    return KErrNone;
 	}
 
 /**