diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/scsi/cd.h | 6 | ||||
| -rw-r--r-- | sys/scsi/sd.c | 7 | ||||
| -rw-r--r-- | sys/scsi/sdvar.h | 6 |
3 files changed, 3 insertions, 16 deletions
diff --git a/sys/scsi/cd.h b/sys/scsi/cd.h index 9ac006fda6c..36a421f696e 100644 --- a/sys/scsi/cd.h +++ b/sys/scsi/cd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.h,v 1.9 2005/08/03 23:37:07 krw Exp $ */ +/* $OpenBSD: cd.h,v 1.10 2006/03/05 14:58:10 krw Exp $ */ /* $NetBSD: scsi_cd.h,v 1.6 1996/03/19 03:06:39 mycroft Exp $ */ /* @@ -252,10 +252,6 @@ struct cd_softc { struct cd_parms orig_params; /* filled in when CD-DA mode starts */ #endif struct buf buf_queue; - -#if NRND > 0 - rndsource_element_t rnd_source; -#endif }; #endif /* _KERNEL */ diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index b53941b688b..f504840f75e 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.102 2006/03/04 19:33:22 miod Exp $ */ +/* $OpenBSD: sd.c,v 1.103 2006/03/05 14:58:10 krw Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -317,11 +317,6 @@ sddetach(self, flags) /* Detach disk. */ disk_detach(&sc->sc_dk); -#if NRND > 0 - /* Unhook the entropy source. */ - rnd_detach_source(&sc->rnd_source); -#endif - return (0); } diff --git a/sys/scsi/sdvar.h b/sys/scsi/sdvar.h index 491801137cd..67035e5a81e 100644 --- a/sys/scsi/sdvar.h +++ b/sys/scsi/sdvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sdvar.h,v 1.8 2005/07/05 00:55:25 krw Exp $ */ +/* $OpenBSD: sdvar.h,v 1.9 2006/03/05 14:58:10 krw Exp $ */ /* $NetBSD: sdvar.h,v 1.7 1998/08/17 00:49:03 mycroft Exp $ */ /*- @@ -79,10 +79,6 @@ struct sd_softc { } params; struct buf buf_queue; void *sc_sdhook; /* our shutdown hook */ - -#if NRND > 0 - rndsource_element_t rnd_source; -#endif }; #define SDGP_RESULT_OK 0 /* parameters obtained */ |