From owner-p4-projects@FreeBSD.ORG  Fri Apr 15 18:58:39 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 054FA16A4D0; Fri, 15 Apr 2005 18:58:39 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D50E116A4CE
	for <perforce@freebsd.org>; Fri, 15 Apr 2005 18:58:38 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AAD9843D5A
	for <perforce@freebsd.org>; Fri, 15 Apr 2005 18:58:38 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3FIwcZc091493
	for <perforce@freebsd.org>; Fri, 15 Apr 2005 18:58:38 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3FIwcMP091490
	for perforce@freebsd.org; Fri, 15 Apr 2005 18:58:38 GMT
	(envelope-from peter@freebsd.org)
Date: Fri, 15 Apr 2005 18:58:38 GMT
Message-Id: <200504151858.j3FIwcMP091490@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 75268 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Fri, 15 Apr 2005 18:58:39 -0000

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

Change 75268 by peter@peter_overcee on 2005/04/15 18:58:34

	Fix a mismerge from somewhere.

Affected files ...

.. //depot/projects/hammer/sys/dev/ata/ata-all.c#47 edit

Differences ...

==== //depot/projects/hammer/sys/dev/ata/ata-all.c#47 (text+ko) ====

@@ -281,7 +281,7 @@
     return error;
 }
 
-void
+static void
 ata_interrupt(void *data)
 {
     struct ata_channel *ch = (struct ata_channel *)data;