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/arm/xscale/pxa2x0_lcd.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/arm/xscale/pxa2x0_lcd.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.11.6.1
retrieving revision 1.12
diff -u -p -r1.11.6.1 -r1.12
--- src/sys/arch/arm/xscale/pxa2x0_lcd.c	2006/04/22 11:37:18	1.11.6.1
+++ src/sys/arch/arm/xscale/pxa2x0_lcd.c	2006/04/10 03:36:03	1.12
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_lcd.c,v 1.11.6.1 2006/04/22 11:37:18 simonb Exp $ */
+/* $NetBSD: pxa2x0_lcd.c,v 1.12 2006/04/10 03:36:03 simonb Exp $ */
 
 /*
  * Copyright (c) 2002  Genetec Corporation.  All rights reserved.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_lcd.c,v 1.11.6.1 2006/04/22 11:37:18 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_lcd.c,v 1.12 2006/04/10 03:36:03 simonb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -612,8 +612,7 @@ pxa2x0_lcd_free_screen(void *v, void *co
 }
 
 int
-pxa2x0_lcd_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag,
-	struct lwp *l)
+pxa2x0_lcd_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
 {
 	struct pxa2x0_lcd_softc *sc = v;
 	struct wsdisplay_fbinfo *wsdisp_info;
@@ -667,7 +666,7 @@ pxa2x0_lcd_ioctl(void *v, void *vs, u_lo
 }
 
 paddr_t
-pxa2x0_lcd_mmap(void *v, void *vs, off_t offset, int prot)
+pxa2x0_lcd_mmap(void *v, off_t offset, int prot)
 {
 	struct pxa2x0_lcd_softc *sc = v;
 	struct pxa2x0_lcd_screen *screen = sc->active;  /* ??? */