The _arch and _mach variables now come from config(8), decreasing even further

the differences between these files.  You will need a newer config(8) binary
to be able to build kernels.
ok kettenis miod

27 files changed, 27 insertions, 81 deletions

diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index dccf69daae9..b5b916bd932 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.alpha,v 1.67 2010/05/25 15:04:59 deraadt Exp $
+#	$OpenBSD: Makefile.alpha,v 1.68 2010/05/25 17:27:54 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		alpha
-_arch?=		alpha
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index 494d2f8755b..4283ea7e3cd 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.amd64,v 1.40 2010/05/25 15:05:00 deraadt Exp $
+#	$OpenBSD: Makefile.amd64,v 1.41 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		amd64
-_arch?=		amd64
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish
index 787df15cbc6..e4d5ceb3edb 100644
--- a/sys/arch/armish/conf/Makefile.armish
+++ b/sys/arch/armish/conf/Makefile.armish
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.armish,v 1.32 2010/05/25 15:05:00 deraadt Exp $
+#	$OpenBSD: Makefile.armish,v 1.33 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		armish
-_arch?=		arm
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/aviion/conf/Makefile.aviion b/sys/arch/aviion/conf/Makefile.aviion
index ed9a505ffff..01b0e4c7f5b 100644
--- a/sys/arch/aviion/conf/Makefile.aviion
+++ b/sys/arch/aviion/conf/Makefile.aviion
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.aviion,v 1.26 2010/05/25 15:05:00 deraadt Exp $
+#	$OpenBSD: Makefile.aviion,v 1.27 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		aviion
-_arch?=		m88k
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/beagle/conf/Makefile.beagle b/sys/arch/beagle/conf/Makefile.beagle
index a5649e71fa0..80dee6cfc1d 100644
--- a/sys/arch/beagle/conf/Makefile.beagle
+++ b/sys/arch/beagle/conf/Makefile.beagle
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.beagle,v 1.26 2010/05/25 15:05:00 deraadt Exp $
+#	$OpenBSD: Makefile.beagle,v 1.27 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		beagle
-_arch?=		arm
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/gumstix/conf/Makefile.gumstix b/sys/arch/gumstix/conf/Makefile.gumstix
index 56eab669289..61c1bd8feb3 100644
--- a/sys/arch/gumstix/conf/Makefile.gumstix
+++ b/sys/arch/gumstix/conf/Makefile.gumstix
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.gumstix,v 1.24 2010/05/25 15:05:00 deraadt Exp $
+#	$OpenBSD: Makefile.gumstix,v 1.25 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		gumstix
-_arch?=		arm
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300
index 9fe2c7cf5f9..738c36b6f59 100644
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hp300,v 1.67 2010/05/25 15:05:01 deraadt Exp $
+#	$OpenBSD: Makefile.hp300,v 1.68 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		hp300
-_arch?=		m68k
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa
index c7d82853d9d..642a303de2c 100644
--- a/sys/arch/hppa/conf/Makefile.hppa
+++ b/sys/arch/hppa/conf/Makefile.hppa
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hppa,v 1.56 2010/05/25 15:05:01 deraadt Exp $
+#	$OpenBSD: Makefile.hppa,v 1.57 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		hppa
-_arch?=		hppa
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64
index d749f339672..6ff2ce3c42c 100644
--- a/sys/arch/hppa64/conf/Makefile.hppa64
+++ b/sys/arch/hppa64/conf/Makefile.hppa64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hppa64,v 1.30 2010/05/25 15:05:01 deraadt Exp $
+#	$OpenBSD: Makefile.hppa64,v 1.31 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		hppa64
-_arch?=		hppa64
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index a71dc052b16..f7fe17f5b1c 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.i386,v 1.73 2010/05/25 15:05:01 deraadt Exp $
+#	$OpenBSD: Makefile.i386,v 1.74 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		i386
-_arch?=		i386
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk
index 1e0cf72bcd2..60f40598e62 100644
--- a/sys/arch/landisk/conf/Makefile.landisk
+++ b/sys/arch/landisk/conf/Makefile.landisk
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.landisk,v 1.33 2010/05/25 15:05:01 deraadt Exp $
+#	$OpenBSD: Makefile.landisk,v 1.34 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		landisk
-_arch?=		sh
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson
index de92e1c7504..9368e7d668d 100644
--- a/sys/arch/loongson/conf/Makefile.loongson
+++ b/sys/arch/loongson/conf/Makefile.loongson
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.loongson,v 1.23 2010/05/25 15:05:01 deraadt Exp $
+#	$OpenBSD: Makefile.loongson,v 1.24 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -26,8 +26,6 @@ LD+=${ENDIAN}
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		loongson
-_arch?=		mips64
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k
index 647dfe81dea..c289965924e 100644
--- a/sys/arch/luna88k/conf/Makefile.luna88k
+++ b/sys/arch/luna88k/conf/Makefile.luna88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.luna88k,v 1.33 2010/05/25 15:05:01 deraadt Exp $
+#	$OpenBSD: Makefile.luna88k,v 1.34 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		luna88k
-_arch?=		m88k
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k
index 6c35be40c28..a7bf2e36496 100644
--- a/sys/arch/mac68k/conf/Makefile.mac68k
+++ b/sys/arch/mac68k/conf/Makefile.mac68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mac68k,v 1.64 2010/05/25 15:05:01 deraadt Exp $
+#	$OpenBSD: Makefile.mac68k,v 1.65 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		mac68k
-_arch?=		m68k
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc
index 762ae38ea0d..c995a5b6a34 100644
--- a/sys/arch/macppc/conf/Makefile.macppc
+++ b/sys/arch/macppc/conf/Makefile.macppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.macppc,v 1.53 2010/05/25 15:05:01 deraadt Exp $
+#	$OpenBSD: Makefile.macppc,v 1.54 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		macppc
-_arch?=		powerpc
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/moko/conf/Makefile.moko b/sys/arch/moko/conf/Makefile.moko
index 480c00e240d..85de3400423 100644
--- a/sys/arch/moko/conf/Makefile.moko
+++ b/sys/arch/moko/conf/Makefile.moko
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.moko,v 1.24 2010/05/25 15:05:01 deraadt Exp $
+#	$OpenBSD: Makefile.moko,v 1.25 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		moko
-_arch?=		arm
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k
index fafa4f202c8..67b1d802a70 100644
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvme68k,v 1.55 2010/05/25 15:05:01 deraadt Exp $
+#	$OpenBSD: Makefile.mvme68k,v 1.56 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		mvme68k
-_arch?=		m68k
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k
index c8910486baa..386e98d6d40 100644
--- a/sys/arch/mvme88k/conf/Makefile.mvme88k
+++ b/sys/arch/mvme88k/conf/Makefile.mvme88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvme88k,v 1.63 2010/05/25 15:05:01 deraadt Exp $
+#	$OpenBSD: Makefile.mvme88k,v 1.64 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		mvme88k
-_arch?=		m88k
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/mvmeppc/conf/Makefile.mvmeppc b/sys/arch/mvmeppc/conf/Makefile.mvmeppc
index d54c13a15f7..996d7012c88 100644
--- a/sys/arch/mvmeppc/conf/Makefile.mvmeppc
+++ b/sys/arch/mvmeppc/conf/Makefile.mvmeppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvmeppc,v 1.50 2010/05/25 15:05:01 deraadt Exp $
+#	$OpenBSD: Makefile.mvmeppc,v 1.51 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		mvmeppc
-_arch?=		powerpc
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/palm/conf/Makefile.palm b/sys/arch/palm/conf/Makefile.palm
index 4597e460dc0..5ec289ebedb 100644
--- a/sys/arch/palm/conf/Makefile.palm
+++ b/sys/arch/palm/conf/Makefile.palm
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.palm,v 1.21 2010/05/25 15:05:01 deraadt Exp $
+#	$OpenBSD: Makefile.palm,v 1.22 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		palm
-_arch?=		arm
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi
index c2d1c9f656b..bbfce023625 100644
--- a/sys/arch/sgi/conf/Makefile.sgi
+++ b/sys/arch/sgi/conf/Makefile.sgi
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sgi,v 1.45 2010/05/25 15:05:01 deraadt Exp $
+#	$OpenBSD: Makefile.sgi,v 1.46 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -26,8 +26,6 @@ LD+=${ENDIAN}
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		sgi
-_arch?=		mips64
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/socppc/conf/Makefile.socppc b/sys/arch/socppc/conf/Makefile.socppc
index 759ad2c5216..11cfa1d0dd2 100644
--- a/sys/arch/socppc/conf/Makefile.socppc
+++ b/sys/arch/socppc/conf/Makefile.socppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.socppc,v 1.24 2010/05/25 15:05:01 deraadt Exp $
+#	$OpenBSD: Makefile.socppc,v 1.25 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		socppc
-_arch?=		powerpc
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/solbourne/conf/Makefile.solbourne b/sys/arch/solbourne/conf/Makefile.solbourne
index 8bf3bebe9c4..54f4f0fda28 100644
--- a/sys/arch/solbourne/conf/Makefile.solbourne
+++ b/sys/arch/solbourne/conf/Makefile.solbourne
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.solbourne,v 1.27 2010/05/25 15:05:01 deraadt Exp $
+#	$OpenBSD: Makefile.solbourne,v 1.28 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		solbourne
-_arch?=		sparc
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc
index 72a57677732..e464e7a20a1 100644
--- a/sys/arch/sparc/conf/Makefile.sparc
+++ b/sys/arch/sparc/conf/Makefile.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sparc,v 1.63 2010/05/25 15:05:02 deraadt Exp $
+#	$OpenBSD: Makefile.sparc,v 1.64 2010/05/25 17:27:55 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		sparc
-_arch?=		sparc
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64
index 003370348c2..1db3cfe7106 100644
--- a/sys/arch/sparc64/conf/Makefile.sparc64
+++ b/sys/arch/sparc64/conf/Makefile.sparc64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sparc64,v 1.50 2010/05/25 15:05:02 deraadt Exp $
+#	$OpenBSD: Makefile.sparc64,v 1.51 2010/05/25 17:27:56 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		sparc64
-_arch?=		sparc64
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index fb80eec4a34..58f5bbfc2e1 100644
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.vax,v 1.53 2010/05/25 15:05:02 deraadt Exp $
+#	$OpenBSD: Makefile.vax,v 1.54 2010/05/25 17:27:56 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		vax
-_arch?=		vax
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}
 
diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus
index ae364d6e530..4936dcb9d05 100644
--- a/sys/arch/zaurus/conf/Makefile.zaurus
+++ b/sys/arch/zaurus/conf/Makefile.zaurus
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.zaurus,v 1.34 2010/05/25 15:05:02 deraadt Exp $
+#	$OpenBSD: Makefile.zaurus,v 1.35 2010/05/25 17:27:56 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -19,8 +19,6 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 
-_mach?=		zaurus
-_arch?=		arm
 _machdir?=	$S/arch/${_mach}
 _archdir?=	$S/arch/${_arch}