From 7d9a4dbad7051621ca58257ba35c40cb6f1b9c1f Mon Sep 17 00:00:00 2001
From: bjh21 <bjh21@NetBSD.org>
Date: Tue, 29 May 2001 23:03:20 +0000
Subject: [PATCH] Move blockio.S from sys/arch/arm32/arm32 to sys/arch/arm/arm,
 since I want to start using it on arm26.

hpcarm gets to keep its own version, since it's not identical and I haven't
got an hpcarm box to test.
---
 sys/arch/{arm32/arm32 => arm/arm}/blockio.S | 2 +-
 sys/arch/arm/conf/files.arm                 | 3 ++-
 sys/arch/arm32/conf/files.arm32             | 3 +--
 sys/arch/cats/conf/files.cats               | 3 +--
 sys/arch/dnard/conf/files.dnard             | 3 +--
 sys/arch/netwinder/conf/files.netwinder     | 3 +--
 6 files changed, 7 insertions(+), 10 deletions(-)
 rename sys/arch/{arm32/arm32 => arm/arm}/blockio.S (99%)

diff --git a/sys/arch/arm32/arm32/blockio.S b/sys/arch/arm/arm/blockio.S
similarity index 99%
rename from sys/arch/arm32/arm32/blockio.S
rename to sys/arch/arm/arm/blockio.S
index 81151318a0bb..fc57e100fa48 100644
--- a/sys/arch/arm32/arm32/blockio.S
+++ b/sys/arch/arm/arm/blockio.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: blockio.S,v 1.10 2001/03/19 22:51:51 rearnsha Exp $	*/
+/*	$NetBSD: blockio.S,v 1.1 2001/05/29 23:03:21 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1994 Mark Brinicombe.
diff --git a/sys/arch/arm/conf/files.arm b/sys/arch/arm/conf/files.arm
index d36ab4965280..19522cd57c0f 100644
--- a/sys/arch/arm/conf/files.arm
+++ b/sys/arch/arm/conf/files.arm
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.28 2001/05/23 19:33:49 chris Exp $
+#	$NetBSD: files.arm,v 1.29 2001/05/29 23:03:20 bjh21 Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defopt	ARM32
@@ -45,6 +45,7 @@ file	arch/arm/mainbus/cpu_mainbus.c		cpu_mainbus & arm32
 file	arch/arm/arm/disassem.c
 
 file	arch/arm/arm/arm_machdep.c
+file	arch/arm/arm/blockio.S
 file	arch/arm/arm/bootconfig.c
 file	arch/arm/arm/compat_13_machdep.c	compat_13
 file	arch/arm/arm/cpufunc.c
diff --git a/sys/arch/arm32/conf/files.arm32 b/sys/arch/arm32/conf/files.arm32
index c873515a0437..fa9811edfeb5 100644
--- a/sys/arch/arm32/conf/files.arm32
+++ b/sys/arch/arm32/conf/files.arm32
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm32,v 1.112 2001/05/26 17:49:47 bjh21 Exp $
+#	$NetBSD: files.arm32,v 1.113 2001/05/29 23:03:20 bjh21 Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -340,7 +340,6 @@ file	arch/arm32/vidc/console/dumb.c 		vt
 
 # Generic MD files
 file	arch/arm32/arm32/autoconf.c
-file	arch/arm32/arm32/blockio.S
 file	arch/arm32/arm32/bus_dma.c
 file	arch/arm32/arm32/conf.c
 file	arch/arm32/arm32/cpuswitch.S
diff --git a/sys/arch/cats/conf/files.cats b/sys/arch/cats/conf/files.cats
index 375eb9d7e46d..dae91921867a 100644
--- a/sys/arch/cats/conf/files.cats
+++ b/sys/arch/cats/conf/files.cats
@@ -1,4 +1,4 @@
-#	$NetBSD: files.cats,v 1.2 2001/05/23 21:21:43 chris Exp $
+#	$NetBSD: files.cats,v 1.3 2001/05/29 23:03:20 bjh21 Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -64,7 +64,6 @@ major   {sd = 24}
 major   {cd = 26}
 
 # Generic MD files
-file	arch/arm32/arm32/blockio.S
 file	arch/arm32/arm32/bus_dma.c
 file	arch/arm32/arm32/conf.c
 file	arch/arm32/arm32/cpuswitch.S
diff --git a/sys/arch/dnard/conf/files.dnard b/sys/arch/dnard/conf/files.dnard
index 9017d7152431..e70558c1be41 100644
--- a/sys/arch/dnard/conf/files.dnard
+++ b/sys/arch/dnard/conf/files.dnard
@@ -1,4 +1,4 @@
-#	$NetBSD: files.dnard,v 1.9 2001/05/09 15:20:49 matt Exp $
+#	$NetBSD: files.dnard,v 1.10 2001/05/29 23:03:21 bjh21 Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -85,7 +85,6 @@ major   {sd = 24}
 major   {cd = 26}
 
 # Generic MD files
-file	arch/arm32/arm32/blockio.S
 file	arch/arm32/arm32/bus_dma.c
 file	arch/arm32/arm32/conf.c
 file	arch/arm32/arm32/cpuswitch.S
diff --git a/sys/arch/netwinder/conf/files.netwinder b/sys/arch/netwinder/conf/files.netwinder
index 9a33106203c6..1bb3fb7c35bd 100644
--- a/sys/arch/netwinder/conf/files.netwinder
+++ b/sys/arch/netwinder/conf/files.netwinder
@@ -1,4 +1,4 @@
-#	$NetBSD: files.netwinder,v 1.6 2001/05/23 21:21:43 chris Exp $
+#	$NetBSD: files.netwinder,v 1.7 2001/05/29 23:03:21 bjh21 Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -74,7 +74,6 @@ major   {cd = 26}
 
 # Generic MD files
 file	arch/arm32/arm32/autoconf.c
-file	arch/arm32/arm32/blockio.S
 file	arch/arm32/arm32/bus_dma.c
 file	arch/netwinder/netwinder/conf.c
 file	arch/arm32/arm32/cpuswitch.S