===================================================================
RCS file: /cvs/funnyos/dev/cpu.c,v
retrieving revision 1.1
retrieving revision 1.4
diff -u -r1.1 -r1.4
--- funnyos/dev/cpu.c	2007/10/16 09:41:04	1.1
+++ funnyos/dev/cpu.c	2007/10/29 21:10:02	1.4
@@ -1,12 +1,11 @@
 /*
- * $Id: cpu.c,v 1.1 2007/10/16 08:41:04 init Exp $
+ * $Id: cpu.c,v 1.4 2007/10/29 21:10:02 init Exp $
  */
 #include <sys/types.h>
 #include <sys/device.h>
-#include <sys/mem.h>
 #include <libkern/printf.h>
 
-#include <sys/cpu.h>
+#include <dev/cpuvar.h>
 
 
 int 	cpu_attach(struct device *, uint32_t, uint8_t);
@@ -15,6 +14,7 @@
 struct driver cpu_dr = {
 	sizeof(struct cpu_dd),
 	cpu_attach,
+	NULL,
 	NULL
 };
 
@@ -32,7 +32,7 @@
 	printf("%s CPU at %d MHz (flags=0x%x)\n", ddp->cpu_name, 
 							ddp->cpu_freq, ddp->cpu_flags);
 
-	return(-1);
+	return(0);
 }
 
 
@@ -42,7 +42,7 @@
 	/*
 	 * Identify given CPU using cp15 (System Control Co-Processor) register 0 (ID)
 	 */
-//	uint32_t rd;
+	 uint32_t rd;
 
 	/* store cp15 ID register into rd */
 //	__asm __volatile("mrc p15 0, %0, c0, c0, 0"