Partially revert some of these changes - misunderstanding between drahn@ and I

about which diff he had tested.

1 files changed, 5 insertions, 6 deletions

diff --git a/sys/arch/arm/xscale/pxa2x0_lcd.h b/sys/arch/arm/xscale/pxa2x0_lcd.h
index 22c18ac6506..12200d87af3 100644
--- a/sys/arch/arm/xscale/pxa2x0_lcd.h
+++ b/sys/arch/arm/xscale/pxa2x0_lcd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxa2x0_lcd.h,v 1.3 2005/01/05 18:11:54 miod Exp $ */
+/*	$OpenBSD: pxa2x0_lcd.h,v 1.4 2005/01/05 19:12:47 miod Exp $ */
 /* $NetBSD: pxa2x0_lcd.h,v 1.2 2003/06/17 09:43:14 bsh Exp $ */
 /*
  * Copyright (c) 2002  Genetec Corporation.  All rights reserved.
@@ -85,8 +85,6 @@ struct pxa2x0_lcd_softc {
 	int n_screens;
 	LIST_HEAD(, pxa2x0_lcd_screen) screens;
 	struct pxa2x0_lcd_screen *active;
-	struct wsdisplay_emulops emulops;	/* master emulops copy */
-
 	void *ih;			/* interrupt handler */
 };
 
@@ -136,9 +134,8 @@ struct pxa2x0_wsscreen_descr {
 	int depth;			/* bits per pixel */
 };
 
-int pxa2x0_lcd_setup_wsscreen(struct pxa2x0_lcd_softc *,
-    struct pxa2x0_wsscreen_descr *, const struct lcd_panel_geometry *,
-    const char * );
+int pxa2x0_lcd_setup_wsscreen(struct pxa2x0_wsscreen_descr *,
+    const struct lcd_panel_geometry *, const char * );
 
 int pxa2x0_lcd_show_screen(void *, void *, int, void (*)(void *, int, int),
     void *);
@@ -148,4 +145,6 @@ int pxa2x0_lcd_alloc_screen(void *, const struct wsscreen_descr *,
     void **, int *, int *, long *);
 void pxa2x0_lcd_free_screen(void *, void *);
 
+extern const struct wsdisplay_emulops pxa2x0_lcd_emulops;
+
 #endif /* _ARM_XSCALE_PXA2X0_LCD_H */