From 0b3782714eddfeba6cf2da708727b5249c69b0fc Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Tue, 17 Jan 1995 17:32:33 +0000
Subject: [PATCH] Enable floppy-tape controller by default again.  Flags no
 longer has any special meaning.

---
 sys/dev/fdc/fdc.c | 7 ++-----
 sys/i386/isa/fd.c | 7 ++-----
 sys/isa/fd.c      | 7 ++-----
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 97f5bd1de69..daaa7f74dce 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.48 1995/01/11 16:13:01 joerg Exp $
+ *	$Id: fd.c,v 1.49 1995/01/12 19:20:28 joerg Exp $
  *
  */
 
@@ -53,9 +53,6 @@
 #endif
 #include "fd.h"
 
-/* Flags */
-#define FT_PROBE		0x1
-
 #if NFDC > 0
 
 #include <sys/param.h>
@@ -581,7 +578,7 @@ fdattach(struct isa_device *dev)
 #if NFT > 0
 			/* If BIOS says no floppy, or > 2nd device */
 			/* Probe for and attach a floppy tape.     */
-			if ((dev->id_flags & FT_PROBE) && ftattach(dev, fdup))
+			if (ftattach(dev, fdup))
 				continue;
 			if (fdsu < DRVS_PER_CTLR) 
 				fd->type = NO_TYPE;
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index 97f5bd1de69..daaa7f74dce 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.48 1995/01/11 16:13:01 joerg Exp $
+ *	$Id: fd.c,v 1.49 1995/01/12 19:20:28 joerg Exp $
  *
  */
 
@@ -53,9 +53,6 @@
 #endif
 #include "fd.h"
 
-/* Flags */
-#define FT_PROBE		0x1
-
 #if NFDC > 0
 
 #include <sys/param.h>
@@ -581,7 +578,7 @@ fdattach(struct isa_device *dev)
 #if NFT > 0
 			/* If BIOS says no floppy, or > 2nd device */
 			/* Probe for and attach a floppy tape.     */
-			if ((dev->id_flags & FT_PROBE) && ftattach(dev, fdup))
+			if (ftattach(dev, fdup))
 				continue;
 			if (fdsu < DRVS_PER_CTLR) 
 				fd->type = NO_TYPE;
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index 97f5bd1de69..daaa7f74dce 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.48 1995/01/11 16:13:01 joerg Exp $
+ *	$Id: fd.c,v 1.49 1995/01/12 19:20:28 joerg Exp $
  *
  */
 
@@ -53,9 +53,6 @@
 #endif
 #include "fd.h"
 
-/* Flags */
-#define FT_PROBE		0x1
-
 #if NFDC > 0
 
 #include <sys/param.h>
@@ -581,7 +578,7 @@ fdattach(struct isa_device *dev)
 #if NFT > 0
 			/* If BIOS says no floppy, or > 2nd device */
 			/* Probe for and attach a floppy tape.     */
-			if ((dev->id_flags & FT_PROBE) && ftattach(dev, fdup))
+			if (ftattach(dev, fdup))
 				continue;
 			if (fdsu < DRVS_PER_CTLR) 
 				fd->type = NO_TYPE;