diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1997-02-03 04:48:09 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1997-02-03 04:48:09 +0000 |
| commit | 3dc2bab62b31e6caa1a00fece6004504f8e08033 (patch) | |
| tree | c3a44aeae3938880a95422164280589feafe53aa /sys/arch/hp300/dev/grf_hy.c | |
| parent | 08e8d869ff1f7248522b236f25044d2744c972dd (diff) | |
Merge new config(8) support from NetBSD, by Jason Thorpe.
Also add siginfo glue, BOOT_CONFIG, and various other changes.
Diffstat (limited to 'sys/arch/hp300/dev/grf_hy.c')
| -rw-r--r-- | sys/arch/hp300/dev/grf_hy.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/arch/hp300/dev/grf_hy.c b/sys/arch/hp300/dev/grf_hy.c index 4a4155c5e42..52f7ddf6ae0 100644 --- a/sys/arch/hp300/dev/grf_hy.c +++ b/sys/arch/hp300/dev/grf_hy.c @@ -1,5 +1,5 @@ -/* $OpenBSD: grf_hy.c,v 1.3 1997/01/12 15:12:35 downsj Exp $ */ -/* $NetBSD: grf_hy.c,v 1.7 1996/12/17 08:41:09 thorpej Exp $ */ +/* $OpenBSD: grf_hy.c,v 1.4 1997/02/03 04:47:28 downsj Exp $ */ +/* $NetBSD: grf_hy.c,v 1.8 1997/01/30 09:18:47 thorpej Exp $ */ /* * Copyright (c) 1996 Jason R. Thorpe. All rights reserved. @@ -83,8 +83,7 @@ int hy_init __P((struct grf_data *gp, int, caddr_t)); int hy_mode __P((struct grf_data *gp, int, caddr_t)); void hyper_ite_fontinit __P((struct ite_data *)); -#ifdef NEWCONFIG -int hyper_dio_match __P((struct device *, struct cfdata *, void *)); +int hyper_dio_match __P((struct device *, void *, void *)); void hyper_dio_attach __P((struct device *, struct device *, void *)); struct cfattach hyper_dio_ca = { @@ -94,7 +93,6 @@ struct cfattach hyper_dio_ca = { struct cfdriver hyper_cd = { NULL, "hyper", DV_DULL }; -#endif /* NEWCONFIG */ /* Hyperion grf switch */ struct grfsw hyper_grfsw = { @@ -119,12 +117,10 @@ struct itesw hyper_itesw = { }; #endif /* NITE > 0 */ -#ifdef NEWCONFIG int hyper_dio_match(parent, match, aux) struct device *parent; - struct cfdata *match; - void *aux; + void *match, *aux; { struct dio_attach_args *da = aux; @@ -158,7 +154,6 @@ hyper_dio_attach(parent, self, aux) grfdev_attach(sc, hy_init, grf, &hyper_grfsw); } -#endif /* NEWCONFIG */ /* * Initialize hardware. |