From f96e932fb10fcc28e3cd711a9e3ad6a03a4b4943 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Tue, 14 Nov 2006 22:27:49 +0000
Subject: [PATCH] Fix for the latest developments in the kernel architecture
 reorganization.

---
 share/man/man4/man4.i386/ar.4 | 6 +++---
 share/man/man4/man4.i386/cx.4 | 4 ++--
 share/man/man4/man4.i386/sr.4 | 6 +++---
 sys/conf/options              | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/share/man/man4/man4.i386/ar.4 b/share/man/man4/man4.i386/ar.4
index e6c75eadb5..c8fff491fb 100644
--- a/share/man/man4/man4.i386/ar.4
+++ b/share/man/man4/man4.i386/ar.4
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/ar.4,v 1.17.2.4 2001/08/17 13:08:45 ru Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/ar.4,v 1.6 2006/10/24 17:09:45 swildner Exp $
+.\" $DragonFly: src/share/man/man4/man4.i386/ar.4,v 1.7 2006/11/14 22:27:49 swildner Exp $
 .\"
 .Dd November 19, 1995
 .Dt AR 4 i386
@@ -83,12 +83,12 @@ The node will have the same name as the device with ``sync_''
 prepended, e.g.,
 .Dv sync_ar0 .
 .Sh FILES
-.Bl -tag -width /sys/arch/i386/isa/ic/hd64570.h -compact
+.Bl -tag -width /sys/machine/pc32/isa/ic/hd64570.h -compact
 .It Pa /sys/dev/netif/ar/if_ar.c
 .It Pa /sys/dev/netif/ar/if_ar.h
 .It Pa /sys/dev/netif/ar/if_ar_pci.c
 .It Pa /sys/dev/netif/ar/if_arregs.h
-.It Pa /sys/arch/i386/isa/ic/hd64570.h
+.It Pa /sys/machine/pc32/isa/ic/hd64570.h
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/man4.i386/cx.4 b/share/man/man4/man4.i386/cx.4
index 759fc97165..fa3608cdfc 100644
--- a/share/man/man4/man4.i386/cx.4
+++ b/share/man/man4/man4.i386/cx.4
@@ -1,6 +1,6 @@
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/cx.4,v 1.7.2.6 2001/08/17 13:08:45 ru Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/cx.4,v 1.3 2006/10/24 17:09:45 swildner Exp $
+.\" $DragonFly: src/share/man/man4/man4.i386/cx.4,v 1.4 2006/11/14 22:27:49 swildner Exp $
 .\"
 .Dd December 12, 1994
 .Dt CX 4 i386
@@ -271,7 +271,7 @@ The sources for the driver reside in:
 .It Pa /sys/dev/serial/cronyx/cronyx.c
 .It Pa /sys/dev/netif/cx/cx.c
 .It Pa /sys/dev/netif/cx/if_cx.c
-.It Pa /sys/arch/i386/include/cronyx.h
+.It Pa /sys/machine/pc32/include/cronyx.h
 .It Pa /sys/dev/netif/cx/cxreg.h
 .It Pa /sys/net/sppp/if_spppsubr.c
 .It Pa /sys/net/sppp/if_sppp.h
diff --git a/share/man/man4/man4.i386/sr.4 b/share/man/man4/man4.i386/sr.4
index 271a12994d..79cdb5d6e1 100644
--- a/share/man/man4/man4.i386/sr.4
+++ b/share/man/man4/man4.i386/sr.4
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/sr.4,v 1.15.2.4 2001/08/17 13:08:46 ru Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/sr.4,v 1.6 2006/10/24 17:09:45 swildner Exp $
+.\" $DragonFly: src/share/man/man4/man4.i386/sr.4,v 1.7 2006/11/14 22:27:49 swildner Exp $
 .\"
 .Dd July 4, 1996
 .Dt SR 4 i386
@@ -111,12 +111,12 @@ The node will have the same name as the device with ``sync_''
 prepended, e.g.,
 .Dv sync_sr0 .
 .Sh FILES
-.Bl -tag -width /sys/arch/i386/isa/ic/hd64570.h -compact
+.Bl -tag -width /sys/machine/pc32/isa/ic/hd64570.h -compact
 .It Pa /sys/dev/netif/sr/if_sr.c
 .It Pa /sys/dev/netif/sr/if_sr.h
 .It Pa /sys/dev/netif/sr/if_sr_pci.c
 .It Pa /sys/dev/netif/sr/if_srregs.h
-.It Pa /sys/arch/i386/isa/ic/hd64570.h
+.It Pa /sys/machine/pc32/isa/ic/hd64570.h
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/sys/conf/options b/sys/conf/options
index 49e1c1c588..b399ff758e 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,5 +1,5 @@
 # $FreeBSD: src/sys/conf/options,v 1.191.2.53 2003/06/04 17:56:58 sam Exp $
-# $DragonFly: src/sys/conf/options,v 1.56 2006/10/24 17:09:46 swildner Exp $
+# $DragonFly: src/sys/conf/options,v 1.57 2006/11/14 22:27:49 swildner Exp $
 #
 #        On the handling of kernel options
 #
@@ -148,7 +148,7 @@ UDF		opt_dontuse.h
 NTFS		opt_dontuse.h
 
 # These static filesystems has one slightly bogus static dependency in
-# sys/arch/i386/i386/autoconf.c.  If any of these filesystems are
+# sys/machine/.../i386/autoconf.c.  If any of these filesystems are
 # statically compiled into the kernel, code for mounting them as root
 # filesystems will be enabled - but look below.  Boot-code is purposely
 # unavailable for the LKM-based versions.
-- 
2.41.0