From a41a73c44a0886815405c9b0ab2ab9de51423045 Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Fri, 23 Nov 2001 19:51:32 +0000
Subject: [PATCH] No longer need <machine/cpus.h>

---
 sys/arch/acorn32/include/Makefile | 4 ++--
 sys/arch/acorn32/include/cpus.h   | 4 ----
 sys/arch/arm32/include/Makefile   | 4 ++--
 sys/arch/arm32/include/cpus.h     | 4 ----
 sys/arch/hpcarm/include/Makefile  | 4 ++--
 sys/arch/hpcarm/include/cpus.h    | 4 ----
 6 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 sys/arch/acorn32/include/cpus.h
 delete mode 100644 sys/arch/arm32/include/cpus.h
 delete mode 100644 sys/arch/hpcarm/include/cpus.h

diff --git a/sys/arch/acorn32/include/Makefile b/sys/arch/acorn32/include/Makefile
index 9786a2b9f22a..a8e7a2dcc703 100644
--- a/sys/arch/acorn32/include/Makefile
+++ b/sys/arch/acorn32/include/Makefile
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.4 2001/11/23 19:40:45 thorpej Exp $
+#	$NetBSD: Makefile,v 1.5 2001/11/23 19:51:32 thorpej Exp $
 
 KDIR=	/sys/arch/acorn32/include
 INCSDIR= /usr/include/acorn32
 
 INCS=	ansi.h aout_machdep.h asm.h \
 	beep.h bootconfig.h bswap.h bus.h \
-	cdefs.h conf.h cpu.h cpus.h \
+	cdefs.h conf.h cpu.h \
 	db_machdep.h devmap.h disklabel.h disklabel_acorn.h \
 	elf_machdep.h endian.h endian_machdep.h \
 	float.h fp.h frame.h \
diff --git a/sys/arch/acorn32/include/cpus.h b/sys/arch/acorn32/include/cpus.h
deleted file mode 100644
index 3e1c82ae3c87..000000000000
--- a/sys/arch/acorn32/include/cpus.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $NetBSD: cpus.h,v 1.1 2001/10/05 22:27:49 reinoud Exp $ */
-
-#include <arm/cpus.h>
-
diff --git a/sys/arch/arm32/include/Makefile b/sys/arch/arm32/include/Makefile
index fb1986e54cae..ecb4c723d83e 100644
--- a/sys/arch/arm32/include/Makefile
+++ b/sys/arch/arm32/include/Makefile
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.17 2001/11/23 19:40:46 thorpej Exp $
+#	$NetBSD: Makefile,v 1.18 2001/11/23 19:51:32 thorpej Exp $
 
 KDIR=	/sys/arch/arm32/include
 INCSDIR= /usr/include/arm32
 
 INCS=	ansi.h aout_machdep.h asm.h \
 	beep.h bootconfig.h bswap.h bus.h \
-	cdefs.h conf.h cpu.h cpus.h \
+	cdefs.h conf.h cpu.h \
 	db_machdep.h devmap.h disklabel.h disklabel_acorn.h \
 	elf_machdep.h endian.h endian_machdep.h \
 	float.h fp.h frame.h \
diff --git a/sys/arch/arm32/include/cpus.h b/sys/arch/arm32/include/cpus.h
deleted file mode 100644
index 252fb0466dce..000000000000
--- a/sys/arch/arm32/include/cpus.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $NetBSD: cpus.h,v 1.8 2001/02/23 21:23:50 reinoud Exp $ */
-
-#include <arm/cpus.h>
-
diff --git a/sys/arch/hpcarm/include/Makefile b/sys/arch/hpcarm/include/Makefile
index 4922da042c43..7b5fcfd096bd 100644
--- a/sys/arch/hpcarm/include/Makefile
+++ b/sys/arch/hpcarm/include/Makefile
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.9 2001/09/03 19:20:29 matt Exp $
+#	$NetBSD: Makefile,v 1.10 2001/11/23 19:51:33 thorpej Exp $
 
 KDIR=	/sys/arch/hpcarm/include
 INCSDIR= /usr/include/hpcarm
 
 INCS=	ansi.h aout_machdep.h asm.h \
 	bootconfig.h bswap.h bus.h \
-	cdefs.h config_hook.h cpu.h cpufunc.h cpus.h \
+	cdefs.h config_hook.h cpu.h cpufunc.h \
 	db_machdep.h disklabel.h \
 	elf_machdep.h endian.h endian_machdep.h \
 	float.h fp.h frame.h \
diff --git a/sys/arch/hpcarm/include/cpus.h b/sys/arch/hpcarm/include/cpus.h
deleted file mode 100644
index 5fa74053c5e9..000000000000
--- a/sys/arch/hpcarm/include/cpus.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $NetBSD: cpus.h,v 1.2 2001/02/23 21:23:52 reinoud Exp $ */
-
-#include <arm/cpus.h>
-