diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2004-02-01 15:39:39 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2004-02-01 15:39:39 +0000 |
| commit | fdf71056908c1a7d52defc0e8776566d6aaf3874 (patch) | |
| tree | 4be9a0ab0c5f2714864123295764edb9a9714bb7 /sys/arch/sparc/dev | |
| parent | 3aad4ff51bc0877fd89db0a2be4c58494785b5ff (diff) | |
Trivial touches to compile with gcc 3.
Diffstat (limited to 'sys/arch/sparc/dev')
| -rw-r--r-- | sys/arch/sparc/dev/cgtworeg.h | 4 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/dma.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/sparc/dev/cgtworeg.h b/sys/arch/sparc/dev/cgtworeg.h index 430f96cf3ba..73b74dcb172 100644 --- a/sys/arch/sparc/dev/cgtworeg.h +++ b/sys/arch/sparc/dev/cgtworeg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cgtworeg.h,v 1.1 2002/08/12 10:44:04 miod Exp $ */ +/* $OpenBSD: cgtworeg.h,v 1.2 2004/02/01 15:39:37 miod Exp $ */ /* $NetBSD: cgtworeg.h,v 1.3 1995/10/04 00:21:27 pk Exp $ */ /* @@ -137,7 +137,7 @@ struct dblbufreg { */ struct cg2_zoom { union { - u_int short reg; + u_short reg; u_char reg_pad[4096]; } wordpan; union { diff --git a/sys/arch/sparc/dev/dma.c b/sys/arch/sparc/dev/dma.c index 7f4565b17f7..50a5bdacac4 100644 --- a/sys/arch/sparc/dev/dma.c +++ b/sys/arch/sparc/dev/dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dma.c,v 1.18 2003/06/05 12:27:02 deraadt Exp $ */ +/* $OpenBSD: dma.c,v 1.19 2004/02/01 15:39:37 miod Exp $ */ /* $NetBSD: dma.c,v 1.46 1997/08/27 11:24:16 bouyer Exp $ */ /* @@ -356,6 +356,7 @@ dma_reset(sc, isledma) DMACSR(sc) |= 0x800; break; default: + break; } sc->sc_active = 0; /* and of course we aren't */ |