From owner-freebsd-stable@FreeBSD.ORG  Sun Sep 21 03:53:34 2003
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 1D30016A4BF; Sun, 21 Sep 2003 03:53:34 -0700 (PDT)
Received: from cirb503493.alcatel.com.au
	(c211-28-27-130.belrs2.nsw.optusnet.com.au [211.28.27.130])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 8FE1943FF9; Sun, 21 Sep 2003 03:53:32 -0700 (PDT)
	(envelope-from PeterJeremy@optushome.com.au)
Received: from cirb503493.alcatel.com.au (localhost.alcatel.com.au
	[127.0.0.1])h8LArVng000257;	Sun, 21 Sep 2003 20:53:31 +1000 (EST)
	(envelope-from jeremyp@cirb503493.alcatel.com.au)
Received: (from jeremyp@localhost)h8LArVIe000256;
	Sun, 21 Sep 2003 20:53:31 +1000 (EST)	(envelope-from jeremyp)
Date: Sun, 21 Sep 2003 20:53:31 +1000
From: Peter Jeremy <PeterJeremy@optushome.com.au>
To: freebsd-stable@freebsd.org, sos@freebsd.org, luoqi@freebsd.org
Message-ID: <20030921105331.GA242@cirb503493.alcatel.com.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4.1i
Subject: Kernel compile failure without pci.
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Production branch of FreeBSD source code
	<freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Sep 2003 10:53:34 -0000

A kernel including ata but no pci fails during build with an
conflicting declaration of ata_dmastart() in ata-isa.c.  The
fix is below.  Could someone please include this in 4.9 as is
or do I need to file a PR.
============================
RCS file: /usr/ncvs/src/sys/dev/ata/ata-isa.c,v
retrieving revision 1.4.2.2
diff -u -r1.4.2.2 ata-isa.c
--- ata-isa.c   5 Sep 2003 07:29:10 -0000       1.4.2.2
+++ ata-isa.c   21 Sep 2003 09:03:37 -0000
@@ -134,9 +134,10 @@
     return -1;
 }
 
-void
+int
 ata_dmastart(struct ata_device *atadev, caddr_t data, int32_t count, int dir)
 {
+    return -1;
 }
 
 int
============================
Peter