From 8343d904fdea03c3a0db30a9482a139ebebab589 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Mon, 26 Jul 1999 07:43:26 +0000
Subject: [PATCH] Pave the way for the fla driver.

---
 sys/conf/files.i386       | 9 +++++++--
 sys/i386/conf/files.i386  | 9 +++++++--
 sys/i386/isa/isa_compat.h | 6 +-----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 48d810f72a97..e613804c902c 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.252 1999/07/03 18:34:02 peter Exp $
+#	$Id: files.i386,v 1.253 1999/07/03 19:19:34 peter Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -34,6 +34,12 @@ ukbdmap.h			optional	ukbd_dflt_keymap	\
 	no-obj no-implicit-rule before-depend				\
 	clean		"ukbdmap.h"
 #
+contrib/dev/fla/fla.c		optional	fla
+msysosak.o			optional	fla			\
+	dependency	"$S/contrib/dev/fla/i386/msysosak.o.uu" 		\
+	compile-with	"uudecode < $S/contrib/dev/fla/i386/msysosak.o.uu"	\
+	no-implicit-rule
+#
 contrib/dev/oltr/if_oltr.c	optional	oltr
 trlld.o				optional	oltr			\
 	dependency	"$S/contrib/dev/oltr/i386-${KERNFORMAT}.trlld.o.uu" \
@@ -185,7 +191,6 @@ i386/isa/diskslice_machdep.c	standard
 i386/isa/elink.c		optional	ep
 i386/isa/elink.c		optional	ie
 isa/fd.c			optional	fd
-i386/isa/fla.c			optional	fla
 i386/isa/gpib.c			optional	gp
 i386/isa/gsc.c			optional	gsc
 i386/isa/if_ar.c		optional	ar
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index 48d810f72a97..e613804c902c 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.252 1999/07/03 18:34:02 peter Exp $
+#	$Id: files.i386,v 1.253 1999/07/03 19:19:34 peter Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -34,6 +34,12 @@ ukbdmap.h			optional	ukbd_dflt_keymap	\
 	no-obj no-implicit-rule before-depend				\
 	clean		"ukbdmap.h"
 #
+contrib/dev/fla/fla.c		optional	fla
+msysosak.o			optional	fla			\
+	dependency	"$S/contrib/dev/fla/i386/msysosak.o.uu" 		\
+	compile-with	"uudecode < $S/contrib/dev/fla/i386/msysosak.o.uu"	\
+	no-implicit-rule
+#
 contrib/dev/oltr/if_oltr.c	optional	oltr
 trlld.o				optional	oltr			\
 	dependency	"$S/contrib/dev/oltr/i386-${KERNFORMAT}.trlld.o.uu" \
@@ -185,7 +191,6 @@ i386/isa/diskslice_machdep.c	standard
 i386/isa/elink.c		optional	ep
 i386/isa/elink.c		optional	ie
 isa/fd.c			optional	fd
-i386/isa/fla.c			optional	fla
 i386/isa/gpib.c			optional	gp
 i386/isa/gsc.c			optional	gsc
 i386/isa/if_ar.c		optional	ar
diff --git a/sys/i386/isa/isa_compat.h b/sys/i386/isa/isa_compat.h
index 98e32359c149..6d763811ae45 100644
--- a/sys/i386/isa/isa_compat.h
+++ b/sys/i386/isa/isa_compat.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isa_compat.h,v 1.6 1999/05/08 21:59:26 dfr Exp $
+ *	$Id: isa_compat.h,v 1.7 1999/05/09 09:56:52 phk Exp $
  */
 
 #include "vt.h"
@@ -161,7 +161,6 @@ extern struct isa_driver pcfdriver;
 extern struct isa_driver isicdriver;
 extern struct isa_driver tinadriver;
 extern struct isa_driver ppcdriver;
-extern struct isa_driver fladriver;
 #ifdef PC98
 extern struct isa_driver bsdriver;
 #endif
@@ -260,9 +259,6 @@ static struct old_isa_driver old_drivers[] = {
 #if NWT > 0
 	{ INTR_TYPE_BIO, &wtdriver },
 #endif
-#if NFLA > 0
-	{ INTR_TYPE_BIO, &fladriver },
-#endif
 
 /* NET */