PERFORCE change 150927 for review

[Nathan Whitehorn]

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

Change 150927 by nwhitehorn at nwhitehorn_trantor on 2008/10/04 03:58:11

	Fix miscellaneous mismerges and misimports.

Affected files ...

.. //depot/projects/ppc-g5/sys/dev/powermac_nvram/powermac_nvram.c#3 edit
.. //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#5 edit
.. //depot/projects/ppc-g5/sys/powerpc/powermac/ata_kauai.c#5 edit

Differences ...

==== //depot/projects/ppc-g5/sys/dev/powermac_nvram/powermac_nvram.c#3 (text+ko) ====

@@ -45,7 +45,6 @@
 
 #include <sys/rman.h>
 
-#include <powerpc/ofw/ofw_pci.h>
 #include <dev/powermac_nvram/powermac_nvramvar.h>
 
 #include <vm/vm.h>

==== //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#5 (text+ko) ====

@@ -139,7 +139,6 @@
 char		machine[] = "powerpc";
 SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, "");
 
-extern int cacheline_size;
 static void	cpu_startup(void *);
 SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL);
 

==== //depot/projects/ppc-g5/sys/powerpc/powermac/ata_kauai.c#5 (text+ko) ====

@@ -196,7 +196,7 @@
 	struct ata_kauai_softc *sc;
 	u_int32_t devid;
 	phandle_t node;
-	char *compatstring = NULL;
+	const char *compatstring = NULL;
 	int i, found, rid;
 
 	found = 0;
@@ -216,7 +216,7 @@
 	bzero(sc, sizeof(struct ata_kauai_softc));
 	ch = &sc->sc_ch.sc_ch;
 
-	compatstring = ofw_bus_get_compatible(node);
+	compatstring = ofw_bus_get_compat(dev);
 	if (compatstring != NULL && strcmp(compatstring,"shasta-ata") == 0)
 		sc->shasta = 1;