Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 Mar 2007 18:29:09 GMT
From:      Marcel Moolenaar <marcel@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 116856 for review
Message-ID:  <200703291829.l2TIT9uu000933@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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);
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703291829.l2TIT9uu000933>