From owner-cvs-all@FreeBSD.ORG  Thu Apr  3 08:20:16 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id E105837B401; Thu,  3 Apr 2003 08:20:16 -0800 (PST)
Received: from critter.freebsd.dk (esplanaden.cybercity.dk [212.242.40.114])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 4441E43F3F; Thu,  3 Apr 2003 08:20:15 -0800 (PST)
	(envelope-from phk@phk.freebsd.dk)
Received: from critter.freebsd.dk (localhost [127.0.0.1])
	by critter.freebsd.dk (8.12.9/8.12.9) with ESMTP id h33GKDGQ004541;
	Thu, 3 Apr 2003 18:20:13 +0200 (CEST)
	(envelope-from phk@phk.freebsd.dk)
To: des@ofug.org (Dag-Erling =?iso-8859-1?q?Sm=F8rgrav?=)
From: "Poul-Henning Kamp" <phk@phk.freebsd.dk>
In-Reply-To: Your message of "Thu, 03 Apr 2003 18:17:39 +0200."
             <xzppto3eesc.fsf@flood.ping.uio.no> 
Date: Thu, 03 Apr 2003 18:20:13 +0200
Message-ID: <4540.1049386813@critter.freebsd.dk>
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
cc: cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/sys/sys disk.h 
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Apr 2003 16:20:17 -0000

In message <xzppto3eesc.fsf@flood.ping.uio.no>, Dag-Erling =?iso-8859-1?q?Sm=F8
rgrav?= writes:
>Poul-Henning Kamp <phk@FreeBSD.org> writes:
>>   Log:
>>   I think the divorce successed, so stop #including <geom/geom_disk.h>
>
>I think this breaks the ofw driver (and thus also the powerpc build)

Unless it is in "make universe" I don't test the powerpc build.

You should be able to just change the include in the ofw driver

from
	<sys/disk.h>
to
	<geom/geom_disk.h>

and make it work.

-- 
Poul-Henning Kamp       | UNIX since Zilog Zeus 3.20
phk@FreeBSD.ORG         | TCP/IP since RFC 956
FreeBSD committer       | BSD since 4.3-tahoe    
Never attribute to malice what can adequately be explained by incompetence.