From owner-p4-projects@FreeBSD.ORG  Wed Jun 14 18:47:09 2006
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 7D16F16A47A; Wed, 14 Jun 2006 18:47:09 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 4081616A41A
	for <perforce@freebsd.org>; Wed, 14 Jun 2006 18:47:09 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0E02643D46
	for <perforce@freebsd.org>; Wed, 14 Jun 2006 18:47:09 +0000 (GMT)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5EIl8ED028982
	for <perforce@freebsd.org>; Wed, 14 Jun 2006 18:47:08 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5EIl8wN028979
	for perforce@freebsd.org; Wed, 14 Jun 2006 18:47:08 GMT
	(envelope-from piso@freebsd.org)
Date: Wed, 14 Jun 2006 18:47:08 GMT
Message-Id: <200606141847.k5EIl8wN028979@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 99248 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: Wed, 14 Jun 2006 18:47:09 -0000

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

Change 99248 by piso@piso_newluxor on 2006/06/14 18:46:37

	Fixed compilation of cy

Affected files ...

.. //depot/projects/soc2006/intr_filter/dev/cy/cy.c#3 edit
.. //depot/projects/soc2006/intr_filter/dev/cy/cy_pci.c#3 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/dev/cy/cy.c#3 (text+ko) ====

@@ -644,7 +644,7 @@
 			  com->mcr_image |= com->mcr_rts);
 }
 
-intr
+int
 cyintr(void *vcom)
 {
 	struct com_s	*basecom;

==== //depot/projects/soc2006/intr_filter/dev/cy/cy_pci.c#3 (text+ko) ====

@@ -153,7 +153,7 @@
 #endif
 	if (irq_setup != 0)
 		irq_setup = bus_setup_intr(dev, irq_res, INTR_TYPE_TTY,
-		    cyintr, vsc, &irq_cookie);
+		    (driver_intr_t *)cyintr, vsc, &irq_cookie);
 	if (irq_setup != 0) {
 		device_printf(dev, "interrupt setup failed\n");
 		goto fail;