xnu-1228.3.13.tar.gz

[apple/xnu.git] / osfmk / ppc / conf.c

diff --git a/osfmk/ppc/conf.c b/osfmk/ppc/conf.c
index a1575fdca275fafc006e6cb5ad044672e83bff72..adeb60ea748f3ad6210e02ce0fe19efc8c701b2a 100644 (file)
--- a/osfmk/ppc/conf.c
+++ b/osfmk/ppc/conf.c
@@ -1,16 +1,19 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_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
  * 
  * 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.
+ * 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 file.

  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -74,10 +77,10 @@ extern      struct clock_ops        sysclk_ops, calend_ops;
 struct clock   clock_list[] = {
 
        /* SYSTEM_CLOCK */
 struct clock   clock_list[] = {
 
        /* SYSTEM_CLOCK */

-       { &sysclk_ops,          0,      0,      0 },
+       { &sysclk_ops, NULL, NULL },

 
        /* CALENDAR_CLOCK */
 
        /* CALENDAR_CLOCK */

-       { &calend_ops,          0,      0,      0 },
+       { &calend_ops, NULL, NULL },

 };
 int    clock_count = sizeof(clock_list) / sizeof(clock_list[0]);
 
 };
 int    clock_count = sizeof(clock_list) / sizeof(clock_list[0]);