From owner-p4-projects@FreeBSD.ORG  Thu Mar 29 18:29:10 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A8A0216A403; Thu, 29 Mar 2007 18:29:10 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3CC1C16A400
	for <perforce@freebsd.org>; Thu, 29 Mar 2007 18:29:10 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 1327213C468
	for <perforce@freebsd.org>; Thu, 29 Mar 2007 18:29:09 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2TIT9D5000936
	for <perforce@freebsd.org>; Thu, 29 Mar 2007 18:29:09 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2TIT9uu000933
	for perforce@freebsd.org; Thu, 29 Mar 2007 18:29:09 GMT
	(envelope-from marcel@freebsd.org)
Date: Thu, 29 Mar 2007 18:29:09 GMT
Message-Id: <200703291829.l2TIT9uu000933@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 116856 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: Thu, 29 Mar 2007 18:29:10 -0000

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

Change 116856 by marcel@marcel_jnpr on 2007/03/29 18:28:33

	Fix merge conflict: di->ops is a pointer.
	Missed in some prior integration.

Affected files ...

.. //depot/projects/uart/dev/uart/uart_cpu.h#23 edit

Differences ...

==== //depot/projects/uart/dev/uart/uart_cpu.h#23 (text+ko) ====

@@ -141,7 +141,7 @@
 	int res;
 
 	uart_lock(di->hwmtx);
-	res = di->ops.rxready(&di->bas);
+	res = di->ops->rxready(&di->bas);
 	uart_unlock(di->hwmtx);
 	return (res);
 }