--- xnu/xnu-792.12.6/libsa/kext.cpp
+++ xnu/xnu-517/libsa/kext.cpp
@@ -1,31 +1,26 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
  * 
- * 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.  The rights granted to you under the 
- * License may not be used to create, or enable the creation or 
- * redistribution of, unlawful or unlicensed copies of an Apple operating 
- * system, or to circumvent, violate, or enable the circumvention or 
- * violation of, any terms of an Apple operating system software license 
- * agreement.
- *
- * Please obtain a copy of the License at 
- * http://www.opensource.apple.com/apsl/ and read it before using this 
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * 
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_LICENSE_HEADER_END@
  */
 #include <libkern/c++/OSContainers.h>
 #include <IOKit/IOCatalogue.h>
@@ -343,11 +338,9 @@
 static bool
 figureDependenciesForKext(OSDictionary * kextPlist,
     OSDictionary * dependencies,
-    OSString * trueParent,
-    Boolean    skipKernelDependencies)
+    OSString * trueParent)
 {
     bool result = true;
-    bool hasDirectKernelDependency = false;
     OSString * kextName = 0;  // don't release
     OSDictionary * libraries = 0;  // don't release
     OSCollectionIterator * keyIterator = 0; // must release
@@ -389,26 +382,9 @@
             result = false;
             goto finish;
         } else {
-            char is_kernel_component;
-
-            if (!kextIsDependency(libraryName->getCStringNoCopy(), &is_kernel_component))
-                is_kernel_component = false;
-
-            if (!skipKernelDependencies || !is_kernel_component) {
-                dependencies->setObject(libraryName,
-                    trueParent ? trueParent : kextName);
-            }
-            if (!hasDirectKernelDependency && is_kernel_component) {
-                hasDirectKernelDependency = true;
-            }
-        }
-    }
-    if (!hasDirectKernelDependency) {
-        /* a kext without any kernel dependency is assumed dependent on 6.0 */
-        dependencies->setObject("com.apple.kernel.libkern",
+            dependencies->setObject(libraryName,
                 trueParent ? trueParent : kextName);
-        IOLog("Extension \"%s\" has no kernel dependency.\n",
-        	kextName->getCStringNoCopy());
+        }
     }
 
 finish:
@@ -531,7 +507,7 @@
         goto finish;
     }
 
-    if (!figureDependenciesForKext(kextPlist, workingDependencies, NULL, false)) {
+    if (!figureDependenciesForKext(kextPlist, workingDependencies, NULL)) {
         IOLog("can't determine immediate dependencies for extension %s\n",
             kmod_name);
         result = false;
@@ -597,7 +573,7 @@
                 * binaryless, dependency.
                 */
                 if (!figureDependenciesForKext(kextPlist, pendingDependencies,
-                    dependentName, true)) {
+                    dependentName)) {
 
                     IOLog("can't determine immediate dependencies for extension %s\n",
                         library_name);
@@ -661,7 +637,7 @@
            /* Now put the library's dependencies onto the pending set.
             */
             if (!figureDependenciesForKext(kextPlist, pendingDependencies,
-                NULL, false)) {
+                NULL)) {
 
                 IOLog("can't determine immediate dependencies for extension %s\n",
                     library_name);