--- xnu/xnu-124.7/iokit/Kernel/IOStartIOKit.cpp
+++ xnu/xnu-344.49/iokit/Kernel/IOStartIOKit.cpp
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -36,8 +39,6 @@
 #include <IOKit/IOLib.h>
 #include <IOKit/IOKitKeys.h>
 #include <IOKit/IOKitDebug.h>
-#include <IOKit/network/IONetworkController.h>
-#include <IOKit/graphics/IODisplay.h>
 
 #include <IOKit/assert.h>
 
@@ -48,6 +49,45 @@
 
 #include <kern/clock.h>
 
+/*XXX power management hacks XXX*/
+#include <IOKit/IOReturn.h>
+#include <IOKit/IOMessage.h>
+
+extern void *registerSleepWakeInterest(
+						void		*callback,
+						void		*target,
+						void		*refCon);
+/*XXX power management hacks XXX*/
+
+static void
+calend_wakeup_resynch(
+	thread_call_param_t		p0,
+	thread_call_param_t		p1)
+{
+	void		IOKitResetTime(void);
+
+	IOKitResetTime();
+}
+
+static thread_call_t	calend_sleep_wake_call;
+
+static IOReturn
+calend_sleep_wake_notif(
+	void			*target,
+	void			*refCon,
+	unsigned int	messageType,
+	void			*provider,
+	void			*messageArg,
+	vm_size_t		argSize)
+{
+	if (messageType != kIOMessageSystemHasPoweredOn)
+		return (kIOReturnUnsupported);
+
+	if (calend_sleep_wake_call != NULL)
+		thread_call_enter(calend_sleep_wake_call);
+
+	return (kIOReturnSuccess);
+}
 
 void IOKitResetTime( void )
 {
@@ -61,6 +101,13 @@
     IOService::waitForService(
         IOService::resourceMatching("IONVRAM"), &t );
 #endif
+
+	if (calend_sleep_wake_call == NULL) {
+		calend_sleep_wake_call = thread_call_allocate(
+											calend_wakeup_resynch, NULL);
+
+		registerSleepWakeInterest((void *)calend_sleep_wake_notif, NULL, NULL);
+	}
 
     clock_initialize_calendar();
 }
@@ -143,8 +190,6 @@
     IOCatalogue::initialize();
     IOUserClient::initialize();
     IOMemoryDescriptor::initialize();
-    IONetworkController::initialize();
-    IODisplay::initialize();
 
     obj = OSString::withCString( iokit_version );
     assert( obj );
@@ -158,11 +203,6 @@
 	obj->release();
     }
 
-#ifdef i386
-    // pretend there's no device-tree for intel
-    p1 = 0;
-#endif
-
     rootNub = new IOPlatformExpertDevice;
 
     if( rootNub && rootNub->initWithArgs( p1, p2, p3, p4)) {