From owner-p4-projects@FreeBSD.ORG  Sat Oct  4 03:58:28 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A89931065688; Sat,  4 Oct 2008 03:58:28 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6C92F1065686
	for <perforce@freebsd.org>; Sat,  4 Oct 2008 03:58:28 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5A80A8FC18
	for <perforce@freebsd.org>; Sat,  4 Oct 2008 03:58:28 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m943wSiY040400
	for <perforce@freebsd.org>; Sat, 4 Oct 2008 03:58:28 GMT
	(envelope-from nwhitehorn@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m943wSOS040398
	for perforce@freebsd.org; Sat, 4 Oct 2008 03:58:28 GMT
	(envelope-from nwhitehorn@freebsd.org)
Date: Sat, 4 Oct 2008 03:58:28 GMT
Message-Id: <200810040358.m943wSOS040398@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	nwhitehorn@freebsd.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 150927 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Oct 2008 03:58:28 -0000

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

Change 150927 by nwhitehorn@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;