PERFORCE change 135893 for review

[Randall R. Stewart]

http://perforce.freebsd.org/chv.cgi?CH=135893

Change 135893 by rrs at rrs-mips2-jnpr on 2008/02/21 15:25:40

	fixes.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_ebt3000_cf.c#4 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_ebt3000_cf.c#4 (text+ko) ====

@@ -70,8 +70,14 @@
 #include <machine/md_var.h>
 #include <machine/cpuregs.h>
 
-#include "octeon_ebt3000_cf.h"
-#include "driveid.h"
+#include <mips/mips32/octeon32/octeon_ebt3000_cf.h>
+#include <mips/mips32/octeon32/driveid.h>
+/* Octeon specific includes with loads of in-lines */
+#include <mips/mips32/octeon32/octeon_pcmap_regs.h>
+#include <mips/mips32/octeon32/bus_octeon.h>
+
+
+
 
 /* ATA Commands */
 #define CMD_READ_SECTOR		0x20
@@ -572,7 +578,7 @@
 
 
 	if (!octeon_board_real())
-		return 1;
+		return;
 
 	base_addr = (void *)OCTEON_PHYS2PTR(OCTEON_CF_COMMON_BASE_ADDR);