From owner-p4-projects@FreeBSD.ORG  Wed Jun 16 23:04:01 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 09F7316A4D0; Wed, 16 Jun 2004 23:04:01 +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 C2A8216A4CE
	for <perforce@freebsd.org>; Wed, 16 Jun 2004 23:04:00 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BCF7243D1F
	for <perforce@freebsd.org>; Wed, 16 Jun 2004 23:04:00 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5GN3xDL071041
	for <perforce@freebsd.org>; Wed, 16 Jun 2004 23:03:59 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5GN3xlw071038
	for perforce@freebsd.org; Wed, 16 Jun 2004 23:03:59 GMT
	(envelope-from marcel@freebsd.org)
Date: Wed, 16 Jun 2004 23:03:59 GMT
Message-Id: <200406162303.i5GN3xlw071038@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>
Subject: PERFORCE change 55110 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: Wed, 16 Jun 2004 23:04:01 -0000

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

Change 55110 by marcel@marcel_nfs on 2004/06/16 23:03:17

	Missed this one in the IFC @55104

Affected files ...

.. //depot/projects/gdb/sys/dev/gfb/gfb_pci.c#4 integrate

Differences ...

==== //depot/projects/gdb/sys/dev/gfb/gfb_pci.c#4 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/gfb/gfb_pci.c,v 1.11 2004/03/17 17:50:33 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/gfb/gfb_pci.c,v 1.12 2004/06/16 09:46:44 phk Exp $");
 
 #include "opt_fb.h"
 
@@ -228,7 +228,7 @@
 #ifdef FB_INSTALL_CDEV
 
 int
-pcigfb_open(dev_t dev, int flag, int mode, struct thread *td)
+pcigfb_open(struct cdev *dev, int flag, int mode, struct thread *td)
 {
 	struct gfb_softc *sc;
 	int error;
@@ -245,7 +245,7 @@
 }
 
 int
-pcigfb_close(dev_t dev, int flag, int mode, struct thread *td)
+pcigfb_close(struct cdev *dev, int flag, int mode, struct thread *td)
 {
 	struct gfb_softc *sc;
 
@@ -254,7 +254,7 @@
 }
 
 int
-pcigfb_read(dev_t dev, struct uio *uio, int flag)
+pcigfb_read(struct cdev *dev, struct uio *uio, int flag)
 {
 	struct gfb_softc *sc;
 
@@ -263,7 +263,7 @@
 }
 
 int
-pcigfb_write(dev_t dev, struct uio *uio, int flag)
+pcigfb_write(struct cdev *dev, struct uio *uio, int flag)
 {
 	struct gfb_softc *sc;
 
@@ -272,7 +272,7 @@
 }
 
 int
-pcigfb_ioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct thread *td)
+pcigfb_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int flag, struct thread *td)
 {
 	struct gfb_softc *sc;
 
@@ -281,7 +281,7 @@
 }
 
 int
-pcigfb_mmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot)
+pcigfb_mmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot)
 {
 	struct gfb_softc *sc;