From 59d47eeb7950983735bceb06bf666abd1a27a92f Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Wed, 10 Apr 2002 20:10:08 +0000
Subject: [PATCH] Remove "options RISCPC"; nothing tests for it anymore.

---
 sys/arch/acorn32/conf/GENERIC       | 7 ++-----
 sys/arch/acorn32/conf/INSTALL       | 7 ++-----
 sys/arch/acorn32/conf/LOWMEM_WSCONS | 5 +----
 sys/arch/acorn32/conf/NC            | 3 +--
 sys/arch/acorn32/conf/NC_WSCONS     | 3 +--
 sys/arch/acorn32/conf/RPC_WSCONS    | 8 ++------
 6 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/sys/arch/acorn32/conf/GENERIC b/sys/arch/acorn32/conf/GENERIC
index 8021c423a06c..3ee37123661f 100644
--- a/sys/arch/acorn32/conf/GENERIC
+++ b/sys/arch/acorn32/conf/GENERIC
@@ -1,4 +1,4 @@
-# 	$NetBSD: GENERIC,v 1.13 2002/04/02 05:30:36 lukem Exp $
+# 	$NetBSD: GENERIC,v 1.14 2002/04/10 20:10:08 thorpej Exp $
 #
 #	GENERIC --- NetBSD/acorn32 complete configuration
 #
@@ -20,7 +20,7 @@
 
 include		"arch/acorn32/conf/std.acorn32"
 
-#ident		"GENERIC-$Revision: 1.13 $"
+#ident		"GENERIC-$Revision: 1.14 $"
 
 # estimated number of users
 maxusers	32
@@ -40,9 +40,6 @@ options 	CPU_ARM7	# Support the ARM7 core
 # For StrongARM only kernels
 #makeoptions	COPTS="-O2 -march=armv3m -mtune=strongarm"
 
-# Architecture options
-options 	RISCPC		# We are a RiscPC
-
 # FPA options
 #options 	ARMFPE		# ARM Ltd FPE
 
diff --git a/sys/arch/acorn32/conf/INSTALL b/sys/arch/acorn32/conf/INSTALL
index 0ccc96e6408e..9eeb5539ada9 100644
--- a/sys/arch/acorn32/conf/INSTALL
+++ b/sys/arch/acorn32/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.7 2002/04/02 05:30:36 lukem Exp $
+#	$NetBSD: INSTALL,v 1.8 2002/04/10 20:10:08 thorpej Exp $
 #
 #	INSTALL -- NetBSD/acorn32 install configuration
 #
@@ -20,7 +20,7 @@
 
 include		"arch/acorn32/conf/std.acorn32"
 
-#ident		"INSTALL-$Revision: 1.7 $"
+#ident		"INSTALL-$Revision: 1.8 $"
 
 # estimated number of users
 maxusers	32
@@ -40,9 +40,6 @@ options 	CPU_ARM7	# Support the ARM7 core
 # For StrongARM only kernels
 #makeoptions	COPTS="-O2 -march=armv3m -mtune=strongarm"
 
-# Architecture options
-options 	RISCPC		# We are a RiscPC
-
 # FPA options
 #options 	ARMFPE		# ARM Ltd FPE
 
diff --git a/sys/arch/acorn32/conf/LOWMEM_WSCONS b/sys/arch/acorn32/conf/LOWMEM_WSCONS
index 736b4cdf5b50..225d2b650840 100644
--- a/sys/arch/acorn32/conf/LOWMEM_WSCONS
+++ b/sys/arch/acorn32/conf/LOWMEM_WSCONS
@@ -1,4 +1,4 @@
-#	$NetBSD: LOWMEM_WSCONS,v 1.9 2002/04/02 05:30:37 lukem Exp $
+#	$NetBSD: LOWMEM_WSCONS,v 1.10 2002/04/10 20:10:08 thorpej Exp $
 #
 #	LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
 #
@@ -27,9 +27,6 @@ options 	CPU_ARM7	# Support the ARM7 core
 # For small kernels
 makeoptions	COPTS="-Os -fno-inline -Dinline= -D__inline__= -D_inline_= "
 
-# Architecture options
-options 	RISCPC		# We are a RiscPC
-
 # FPA options
 
 #options 	ARMFPE		# ARM Ltd FPE
diff --git a/sys/arch/acorn32/conf/NC b/sys/arch/acorn32/conf/NC
index 686fb1a7542f..991079aa4431 100644
--- a/sys/arch/acorn32/conf/NC
+++ b/sys/arch/acorn32/conf/NC
@@ -1,4 +1,4 @@
-#	$NetBSD: NC,v 1.8 2002/04/02 05:30:37 lukem Exp $
+#	$NetBSD: NC,v 1.9 2002/04/10 20:10:08 thorpej Exp $
 #
 #	NC - with vidcconsole
 #
@@ -22,7 +22,6 @@ options 	CPU_ARM7	# Support the ARM7 core
 #options 	ARM6_LATE_ABORT	# ARM6XX late abort support
 
 # Architecture options
-options 	RISCPC		# We are a RiscPC
 options 	NC
 
 # FPA options
diff --git a/sys/arch/acorn32/conf/NC_WSCONS b/sys/arch/acorn32/conf/NC_WSCONS
index 603a092df2ca..0acf61d00799 100644
--- a/sys/arch/acorn32/conf/NC_WSCONS
+++ b/sys/arch/acorn32/conf/NC_WSCONS
@@ -1,4 +1,4 @@
-#	$NetBSD: NC_WSCONS,v 1.10 2002/04/02 05:30:37 lukem Exp $
+#	$NetBSD: NC_WSCONS,v 1.11 2002/04/10 20:10:08 thorpej Exp $
 #
 #	NC - with wscons
 #
@@ -22,7 +22,6 @@ options 	CPU_ARM7	# Support the ARM7 core
 #options 	ARM6_LATE_ABORT	# ARM6XX late abort support
 
 # Architecture options
-options 	RISCPC		# We are a RiscPC
 #options 	RC7500		# We are a RC7500
 options 	NC
 
diff --git a/sys/arch/acorn32/conf/RPC_WSCONS b/sys/arch/acorn32/conf/RPC_WSCONS
index 417bce2808cb..8a7acd7d86e0 100644
--- a/sys/arch/acorn32/conf/RPC_WSCONS
+++ b/sys/arch/acorn32/conf/RPC_WSCONS
@@ -1,4 +1,4 @@
-#	$NetBSD: RPC_WSCONS,v 1.11 2002/04/02 05:30:37 lukem Exp $
+#	$NetBSD: RPC_WSCONS,v 1.12 2002/04/10 20:10:08 thorpej Exp $
 #
 #	RPC_WSCONS -- Full RiscPC config with wscons
 #
@@ -20,7 +20,7 @@
 
 include		"arch/acorn32/conf/std.acorn32"
 
-#ident		"GENERIC-$Revision: 1.11 $"
+#ident		"GENERIC-$Revision: 1.12 $"
 
 # estimated number of users
 maxusers	32
@@ -40,10 +40,6 @@ options 	CPU_ARM7	# Support the ARM7 core
 # For StrongARM only kernels
 #makeoptions	COPTS="-O2 -march=armv3m -mtune=strongarm"
 
-# Architecture options
-# Architecture options
-options 	RISCPC		# We are a RiscPC
-
 # FPA options
 #options 	ARMFPE		# ARM Ltd FPE