Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/hpcmips/dev/plumvideo.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/hpcmips/dev/plumvideo.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.37
retrieving revision 1.37.26.1
diff -u -p -r1.37 -r1.37.26.1
--- src/sys/arch/hpcmips/dev/plumvideo.c	2005/12/11 12:17:33	1.37
+++ src/sys/arch/hpcmips/dev/plumvideo.c	2007/03/12 05:48:04	1.37.26.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: plumvideo.c,v 1.37 2005/12/11 12:17:33 christos Exp $ */
+/*	$NetBSD: plumvideo.c,v 1.37.26.1 2007/03/12 05:48:04 rmind Exp $ */
 
 /*-
  * Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plumvideo.c,v 1.37 2005/12/11 12:17:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plumvideo.c,v 1.37.26.1 2007/03/12 05:48:04 rmind Exp $");
 
 #undef PLUMVIDEODEBUG
 
@@ -121,7 +121,7 @@ struct plumvideo_softc {
 int	plumvideo_match(struct device*, struct cfdata*, void*);
 void	plumvideo_attach(struct device*, struct device*, void*);
 
-int	plumvideo_ioctl(void *, u_long, caddr_t, int, struct lwp *);
+int	plumvideo_ioctl(void *, u_long, void *, int, struct lwp *);
 paddr_t	plumvideo_mmap(void *, off_t, int);
 
 CFATTACH_DECL(plumvideo, sizeof(struct plumvideo_softc),
@@ -430,7 +430,7 @@ plumvideo_init(struct plumvideo_softc *s
 }
 
 int
-plumvideo_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
+plumvideo_ioctl(void *v, u_long cmd, void *data, int flag, struct lwp *l)
 {
 	struct plumvideo_softc *sc = (struct plumvideo_softc *)v;
 	struct hpcfb_fbconf *fbconf;