diff options
| author | Uwe Stuehler <uwe@cvs.openbsd.org> | 2005-04-11 03:32:49 +0000 |
|---|---|---|
| committer | Uwe Stuehler <uwe@cvs.openbsd.org> | 2005-04-11 03:32:49 +0000 |
| commit | 88700696d9736761a0e7705a8d447f43bffacbf9 (patch) | |
| tree | 6d0d4e7eabbad50741d98cb614888ac470fc3a82 /sys/arch/arm | |
| parent | a0293a692818ed5408c487cf44994bcc2446368a (diff) | |
- eliminate extra powerhook in pxalcd, inspired by ohci changes
- update file comment for zaurus_lcd.c
Diffstat (limited to 'sys/arch/arm')
| -rw-r--r-- | sys/arch/arm/xscale/pxa2x0_lcd.c | 7 | ||||
| -rw-r--r-- | sys/arch/arm/xscale/pxa2x0_lcd.h | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/arm/xscale/pxa2x0_lcd.c b/sys/arch/arm/xscale/pxa2x0_lcd.c index c7f55b49d83..c32df339e3e 100644 --- a/sys/arch/arm/xscale/pxa2x0_lcd.c +++ b/sys/arch/arm/xscale/pxa2x0_lcd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pxa2x0_lcd.c,v 1.16 2005/02/22 21:53:03 uwe Exp $ */ +/* $OpenBSD: pxa2x0_lcd.c,v 1.17 2005/04/11 03:32:48 uwe Exp $ */ /* $NetBSD: pxa2x0_lcd.c,v 1.8 2003/10/03 07:24:05 bsh Exp $ */ /* @@ -91,7 +91,6 @@ void pxa2x0_lcd_start_dma(bus_space_tag_t, bus_space_handle_t, void pxa2x0_lcd_stop_dma(bus_space_tag_t, bus_space_handle_t); void pxa2x0_lcd_suspend(struct pxa2x0_lcd_softc *); void pxa2x0_lcd_resume(struct pxa2x0_lcd_softc *); -void pxa2x0_lcd_powerhook(int, void *); /* * Setup display geometry parameters. @@ -264,8 +263,6 @@ pxa2x0_lcd_attach_sub(struct pxa2x0_lcd_softc *sc, bzero(&dummy, sizeof(dummy)); pxa2x0_lcd_setup_rasops(&dummy, descr, geom); } - - (void)powerhook_establish(pxa2x0_lcd_powerhook, sc); } /* @@ -848,7 +845,7 @@ pxa2x0_lcd_resume(struct pxa2x0_lcd_softc *sc) } void -pxa2x0_lcd_powerhook(int why, void *v) +pxa2x0_lcd_power(int why, void *v) { struct pxa2x0_lcd_softc *sc = v; diff --git a/sys/arch/arm/xscale/pxa2x0_lcd.h b/sys/arch/arm/xscale/pxa2x0_lcd.h index 3ad91375355..1e44f46cd6d 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.8 2005/04/06 01:31:05 pascoe Exp $ */ +/* $OpenBSD: pxa2x0_lcd.h,v 1.9 2005/04/11 03:32:48 uwe Exp $ */ /* $NetBSD: pxa2x0_lcd.h,v 1.2 2003/06/17 09:43:14 bsh Exp $ */ /* * Copyright (c) 2002 Genetec Corporation. All rights reserved. @@ -140,5 +140,6 @@ int pxa2x0_lcd_ioctl(void *, u_long, caddr_t, int, struct proc *); paddr_t pxa2x0_lcd_mmap(void *, off_t, int); int pxa2x0_lcd_show_screen(void *, void *, int, void (*)(void *, int, int), void *); +void pxa2x0_lcd_power(int, void *); #endif /* _ARM_XSCALE_PXA2X0_LCD_H */ |