summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2006-09-26 23:33:05 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2006-09-26 23:33:05 +0000
commit2bf9309e28746a4b6a52286fbfaa52035e8bc80e (patch)
tree1a0c40b9e97feb2a6762ccc9486778b4e20fb856 /sys/dev
parentecd84bf31bad64b35b9fc94c35074f968296f988 (diff)
Zap D_REMOVABLE flag from disklabel. If you didn't already know that
floppies and cd's were removable, displaying that fact in disklabel output was unlikely to help. And the display in disklabel was the only use of D_REMOVABLE in the tree. ok marco@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/isa/fd.c3
-rw-r--r--sys/dev/isa/mcd.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 028b436cef8..8b584f0eb97 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fd.c,v 1.55 2006/08/13 16:24:12 krw Exp $ */
+/* $OpenBSD: fd.c,v 1.56 2006/09/26 23:33:04 krw Exp $ */
/* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */
/*-
@@ -985,7 +985,6 @@ fdioctl(dev, cmd, addr, flag, p)
lp->d_secperunit = fd->sc_type->size;
lp->d_rpm = 300;
lp->d_interleave = 1;
- lp->d_flags = D_REMOVABLE;
lp->d_partitions[RAW_PART].p_offset = 0;
lp->d_partitions[RAW_PART].p_size = lp->d_secperunit;
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index 47cb7b5cafd..e9e7cca0fa7 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mcd.c,v 1.40 2006/08/13 16:24:13 krw Exp $ */
+/* $OpenBSD: mcd.c,v 1.41 2006/09/26 23:33:04 krw Exp $ */
/* $NetBSD: mcd.c,v 1.60 1998/01/14 12:14:41 drochner Exp $ */
/*
@@ -735,7 +735,6 @@ mcdgetdisklabel(dev, sc, lp, clp, spoofonly)
lp->d_secperunit = sc->disksize;
lp->d_rpm = 300;
lp->d_interleave = 1;
- lp->d_flags = D_REMOVABLE;
lp->d_partitions[RAW_PART].p_offset = 0;
lp->d_partitions[RAW_PART].p_size = lp->d_secperunit;