From 44c52d4714ff9be5d51f3c9db98057393c64780e Mon Sep 17 00:00:00 2001
From: scw <scw@NetBSD.org>
Date: Sun, 3 Mar 2002 10:53:10 +0000
Subject: [PATCH] No longer need to define CACHELINESIZE here, and move NEWPMAP
 option to std.mvmeppc since the old pmap module is not supported on mvmeppc.

---
 sys/arch/mvmeppc/conf/MVME1600    | 6 ++----
 sys/arch/mvmeppc/conf/std.mvmeppc | 3 ++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/sys/arch/mvmeppc/conf/MVME1600 b/sys/arch/mvmeppc/conf/MVME1600
index 15a2826bc354..d4cfec67e21e 100644
--- a/sys/arch/mvmeppc/conf/MVME1600
+++ b/sys/arch/mvmeppc/conf/MVME1600
@@ -1,9 +1,9 @@
-# $NetBSD: MVME1600,v 1.1 2002/02/27 21:02:13 scw Exp $
+# $NetBSD: MVME1600,v 1.2 2002/03/03 10:53:10 scw Exp $
 #
 
 include 	"arch/mvmeppc/conf/std.mvmeppc"
 
-#ident		"MVME1600-$Revision: 1.1 $"
+#ident		"MVME1600-$Revision: 1.2 $"
 
 maxusers	8
 
@@ -13,8 +13,6 @@ options 	SUPPORT_MVME160X
 # Standard system options
 
 options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
-options 	CACHELINESIZE=32
-options 	NEWPMAP
 
 options 	KTRACE		# system call tracing via ktrace(1)
 
diff --git a/sys/arch/mvmeppc/conf/std.mvmeppc b/sys/arch/mvmeppc/conf/std.mvmeppc
index fda72057da7a..1d88491c6108 100644
--- a/sys/arch/mvmeppc/conf/std.mvmeppc
+++ b/sys/arch/mvmeppc/conf/std.mvmeppc
@@ -1,4 +1,4 @@
-#	$NetBSD: std.mvmeppc,v 1.1 2002/02/27 21:02:13 scw Exp $
+#	$NetBSD: std.mvmeppc,v 1.2 2002/03/03 10:53:10 scw Exp $
 #
 # standard, required NetBSD/mvmeppc 'options'
 
@@ -7,5 +7,6 @@ machine		mvmeppc powerpc
 options 	PPC_MPC6XX	# Support Motorola PPC60x CPUs
 options 	EXEC_ELF32	# exec ELF binaries
 options 	EXEC_SCRIPT	# exec #! scripts
+options 	NEWPMAP		# Use the new mpc6xx pmap module
 
 makeoptions	TEXTADDR=0x4000