summaryrefslogtreecommitdiff
path: root/sys/scsi
diff options
context:
space:
mode:
Diffstat (limited to 'sys/scsi')
-rw-r--r--sys/scsi/cd.c5
-rw-r--r--sys/scsi/sd.c5
2 files changed, 2 insertions, 8 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 2f599259537..dfdef0f0f1a 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cd.c,v 1.181 2010/07/28 23:47:43 krw Exp $ */
+/* $OpenBSD: cd.c,v 1.182 2010/08/28 20:23:22 matthew Exp $ */
/* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */
/*
@@ -161,8 +161,6 @@ struct cfdriver cd_cd = {
NULL, "cd", DV_DISK
};
-struct dkdriver cddkdriver = { cdstrategy };
-
const struct scsi_inquiry_pattern cd_patterns[] = {
{T_CDROM, T_REMOV,
"", "", ""},
@@ -217,7 +215,6 @@ cdattach(struct device *parent, struct device *self, void *aux)
/*
* Initialize disk structures.
*/
- sc->sc_dk.dk_driver = &cddkdriver;
sc->sc_dk.dk_name = sc->sc_dev.dv_xname;
sc->sc_bufq = bufq_init(BUFQ_DEFAULT);
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 29db37f9585..6a5f9901651 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sd.c,v 1.205 2010/08/03 19:37:17 krw Exp $ */
+/* $OpenBSD: sd.c,v 1.206 2010/08/28 20:23:22 matthew Exp $ */
/* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */
/*-
@@ -111,8 +111,6 @@ struct cfdriver sd_cd = {
NULL, "sd", DV_DISK
};
-struct dkdriver sddkdriver = { sdstrategy };
-
const struct scsi_inquiry_pattern sd_patterns[] = {
{T_DIRECT, T_FIXED,
"", "", ""},
@@ -173,7 +171,6 @@ sdattach(struct device *parent, struct device *self, void *aux)
/*
* Initialize disk structures.
*/
- sc->sc_dk.dk_driver = &sddkdriver;
sc->sc_dk.dk_name = sc->sc_dev.dv_xname;
sc->sc_bufq = bufq_init(BUFQ_DEFAULT);