As per subject, tested on amd64/macppc. OK?
--
Cheers,
Jasper
"During times of universal deceit,
telling the truth becomes a revolutionary act."
Index: alpha/conf/files.alpha
===================================================================
RCS file: /cvs/src/sys/arch/alpha/conf/files.alpha,v
retrieving revision 1.90
diff -p -u -r1.90 files.alpha
--- alpha/conf/files.alpha 30 Jun 2010 20:38:49 -0000 1.90
+++ alpha/conf/files.alpha 6 Dec 2010 18:53:05 -0000
@@ -35,7 +35,7 @@ major {vnd = 9}
#
# Media Independent Interface (mii)
#
-include "../../../dev/mii/files.mii"
+include "dev/mii/files.mii"
#
# Machine-independent SCSI drivers
@@ -269,7 +269,7 @@ file dev/pci/if_hme_pci.c hme_pci
# ISA PnP
#
-include "../../../dev/isa/files.isapnp"
+include "dev/isa/files.isapnp"
file arch/alpha/isa/isapnp_machdep.c isapnp
#
Index: amd64/conf/files.amd64
===================================================================
RCS file: /cvs/src/sys/arch/amd64/conf/files.amd64,v
retrieving revision 1.59
diff -p -u -r1.59 files.amd64
--- amd64/conf/files.amd64 13 Nov 2010 04:16:42 -0000 1.59
+++ amd64/conf/files.amd64 6 Dec 2010 18:53:06 -0000
@@ -225,7 +225,7 @@ include "dev/gpio/files.gpio"
#
# ACPI
#
-include "../../../dev/acpi/files.acpi"
+include "dev/acpi/files.acpi"
file arch/amd64/amd64/acpi_machdep.c acpi
file arch/amd64/amd64/acpi_wakecode.S acpi & !small_kernel
Index: armish/conf/files.armish
===================================================================
RCS file: /cvs/src/sys/arch/armish/conf/files.armish,v
retrieving revision 1.13
diff -p -u -r1.13 files.armish
--- armish/conf/files.armish 16 May 2009 05:47:25 -0000 1.13
+++ armish/conf/files.armish 6 Dec 2010 18:53:07 -0000
@@ -14,7 +14,7 @@ file arch/armish/armish/armish_machdep.c
file arch/armish/armish/autoconf.c
file arch/arm/arm/disksubr.c disk
-include "../../../scsi/files.scsi"
+include "scsi/files.scsi"
# Use the generic ARM soft interrupt code.
file arch/arm/arm/softintr.c
@@ -67,11 +67,11 @@ include "dev/bluetooth/files.bluetooth"
include "dev/mii/files.mii"
# PCI
-include "../../../dev/pci/files.pci"
+include "dev/pci/files.pci"
file arch/armish/dev/pciide_machdep.c pciide
-include "../../../dev/puc/files.puc"
-include "../../../dev/atapiscsi/files.atapiscsi"
+include "dev/puc/files.puc"
+include "dev/atapiscsi/files.atapiscsi"
#
Index: aviion/conf/files.aviion
===================================================================
RCS file: /cvs/src/sys/arch/aviion/conf/files.aviion,v
retrieving revision 1.7
diff -p -u -r1.7 files.aviion
--- aviion/conf/files.aviion 21 Apr 2010 19:33:47 -0000 1.7
+++ aviion/conf/files.aviion 6 Dec 2010 18:53:07 -0000
@@ -35,7 +35,7 @@ file arch/aviion/dev/if_ile_syscon.c i
attach oosiop at syscon with oosiop_syscon
file arch/aviion/dev/oosiop_syscon.c oosiop_syscon
-include "../../../scsi/files.scsi"
+include "scsi/files.scsi"
major {sd = 4}
major {st = 5}
Index: beagle/conf/files.beagle
===================================================================
RCS file: /cvs/src/sys/arch/beagle/conf/files.beagle,v
retrieving revision 1.4
diff -p -u -r1.4 files.beagle
--- beagle/conf/files.beagle 1 Jun 2010 03:01:02 -0000 1.4
+++ beagle/conf/files.beagle 6 Dec 2010 18:53:07 -0000
@@ -28,7 +28,7 @@ file arch/arm/armv7/armv7_mutex.c
# note that the order of the devices in _this_ file
# affects the order that the devices will configure.
-include "../../../dev/sdmmc/files.sdmmc"
+include "dev/sdmmc/files.sdmmc"
device prcm
attach prcm at ahb
@@ -77,8 +77,8 @@ file arch/beagle/dev/omdisplay.c omdisp
#
# Machine-independent SCSI drivers
#
-include "../../../scsi/files.scsi"
-include "../../../dev/atapiscsi/files.atapiscsi"
+include "scsi/files.scsi"
+include "dev/atapiscsi/files.atapiscsi"
# CPU support and integrated peripherals
file arch/arm/arm/irq_dispatch.S
Index: gumstix/conf/files.gumstix
===================================================================
RCS file: /cvs/src/sys/arch/gumstix/conf/files.gumstix,v
retrieving revision 1.1
diff -p -u -r1.1 files.gumstix
--- gumstix/conf/files.gumstix 26 Nov 2008 14:18:11 -0000 1.1
+++ gumstix/conf/files.gumstix 6 Dec 2010 18:53:07 -0000
@@ -18,8 +18,8 @@ file arch/gumstix/gumstix/gumstix_machde
#
# Machine-independent SCSI drivers
#
-include "../../../scsi/files.scsi"
-include "../../../dev/atapiscsi/files.atapiscsi"
+include "scsi/files.scsi"
+include "dev/atapiscsi/files.atapiscsi"
# CPU support and integrated peripherals
include "arch/arm/xscale/files.pxa2x0"
Index: i386/conf/files.i386
===================================================================
RCS file: /cvs/src/sys/arch/i386/conf/files.i386,v
retrieving revision 1.199
diff -p -u -r1.199 files.i386
--- i386/conf/files.i386 14 Oct 2010 21:23:04 -0000 1.199
+++ i386/conf/files.i386 6 Dec 2010 18:53:07 -0000
@@ -59,13 +59,13 @@ include "dev/wsfont/files.wsfont"
#
# Media Independent Interface (mii)
#
-include "../../../dev/mii/files.mii"
+include "dev/mii/files.mii"
#
# Machine-independent SCSI drivers
#
-include "../../../scsi/files.scsi"
+include "scsi/files.scsi"
major {sd = 4}
major {st = 5}
major {cd = 6}
@@ -80,8 +80,8 @@ include "dev/i2o/files.i2o"
# Machine-independent ATAPI drivers
#
-include "../../../dev/atapiscsi/files.atapiscsi"
-include "../../../dev/ata/files.ata"
+include "dev/atapiscsi/files.atapiscsi"
+include "dev/ata/files.ata"
#
# System bus types
@@ -100,7 +100,7 @@ file arch/i386/i386/mainbus.c mainbus
# XXX devices to 'pci'.
#
-include "../../../dev/pci/files.pci"
+include "dev/pci/files.pci"
file arch/i386/pci/pci_machdep.c pci
file arch/i386/pci/pciide_machdep.c pciide
file arch/i386/pci/pcic_pci_machdep.c pcic_pci
@@ -182,7 +182,7 @@ file dev/pci/if_hme_pci.c hme_pci
major {mcd = 7}
major {wd = 0}
-include "../../../dev/isa/files.isa"
+include "dev/isa/files.isa"
file arch/i386/isa/isa_machdep.c isabus
# PC clock
@@ -238,14 +238,14 @@ file arch/i386/i386/nvram.c nvram needs-
# EISA-only drivers
#
-include "../../../dev/eisa/files.eisa"
+include "dev/eisa/files.eisa"
file arch/i386/eisa/eisa_machdep.c eisa
#
# ISA PnP
#
-include "../../../dev/isa/files.isapnp"
+include "dev/isa/files.isapnp"
file arch/i386/isa/isapnp_machdep.c isapnp
# Game adapter (joystick)
@@ -268,22 +268,22 @@ file arch/i386/i386/kvm86.c kvm86
file arch/i386/i386/kvm86call.S kvm86
# a.out binary compatibility (COMPAT_AOUT)
-include "../../../compat/aout/files.aout"
+include "compat/aout/files.aout"
# SVR4 binary compatibility (COMPAT_SVR4)
-include "../../../compat/svr4/files.svr4"
+include "compat/svr4/files.svr4"
file arch/i386/i386/svr4_machdep.c compat_svr4
# Linux binary compatibility (COMPAT_LINUX)
-include "../../../compat/linux/files.linux"
+include "compat/linux/files.linux"
file arch/i386/i386/linux_machdep.c compat_linux
# FreeBSD binary compatibility (COMPAT_FREEBSD)
-include "../../../compat/freebsd/files.freebsd"
+include "compat/freebsd/files.freebsd"
file arch/i386/i386/freebsd_machdep.c compat_freebsd
# OSS audio driver compatibility
-include "../../../compat/ossaudio/files.ossaudio"
+include "compat/ossaudio/files.ossaudio"
device bios {}
attach bios at mainbus
@@ -418,7 +418,7 @@ include "dev/sdmmc/files.sdmmc"
#
include "dev/bluetooth/files.bluetooth"
-include "../../../dev/acpi/files.acpi"
+include "dev/acpi/files.acpi"
file arch/i386/i386/acpi_machdep.c acpi
file arch/i386/i386/acpi_wakecode.S acpi & !small_kernel
Index: luna88k/conf/files.luna88k
===================================================================
RCS file: /cvs/src/sys/arch/luna88k/conf/files.luna88k,v
retrieving revision 1.14
diff -p -u -r1.14 files.luna88k
--- luna88k/conf/files.luna88k 9 Feb 2007 14:26:09 -0000 1.14
+++ luna88k/conf/files.luna88k 6 Dec 2010 18:53:08 -0000
@@ -48,7 +48,7 @@ include "dev/wscons/files.wscons"
device cpu
attach cpu at mainbus
-include "../../../scsi/files.scsi"
+include "scsi/files.scsi"
major {sd = 4}
major {st = 5}
Index: macppc/conf/files.macppc
===================================================================
RCS file: /cvs/src/sys/arch/macppc/conf/files.macppc,v
retrieving revision 1.62
diff -p -u -r1.62 files.macppc
--- macppc/conf/files.macppc 9 Apr 2010 19:24:17 -0000 1.62
+++ macppc/conf/files.macppc 6 Dec 2010 18:53:08 -0000
@@ -26,7 +26,7 @@ file arch/macppc/macppc/db_interface.c
#
# Media Independent Interface (mii)
#
-include "../../../dev/mii/files.mii"
+include "dev/mii/files.mii"
#
# MAC generic
@@ -56,12 +56,12 @@ major {wd = 0}
major {sd = 2}
major {cd = 3}
-include "../../../scsi/files.scsi"
+include "scsi/files.scsi"
#
# I2O
#
-include "../../../dev/i2o/files.i2o"
+include "dev/i2o/files.i2o"
include "dev/pci/files.pci"
file arch/macppc/pci/pciide_machdep.c pciide
@@ -102,8 +102,8 @@ file arch/macppc/pci/pchb.c
pchb
# Machine-independent ATAPI drivers
#
-include "../../../dev/atapiscsi/files.atapiscsi"
-include "../../../dev/ata/files.ata"
+include "dev/atapiscsi/files.atapiscsi"
+include "dev/ata/files.ata"
# MAC periph
Index: mvme68k/conf/files.mvme68k
===================================================================
RCS file: /cvs/src/sys/arch/mvme68k/conf/files.mvme68k,v
retrieving revision 1.34
diff -p -u -r1.34 files.mvme68k
--- mvme68k/conf/files.mvme68k 29 Jun 2010 20:30:33 -0000 1.34
+++ mvme68k/conf/files.mvme68k 6 Dec 2010 18:53:08 -0000
@@ -70,7 +70,7 @@ file arch/mvme68k/dev/if_le.c le
attach ie at mc, pcctwo
file arch/mvme68k/dev/if_ie.c ie
-include "../../../scsi/files.scsi"
+include "scsi/files.scsi"
device wdsc: scsi
attach wdsc at pcc
Index: mvme88k/conf/files.mvme88k
===================================================================
RCS file: /cvs/src/sys/arch/mvme88k/conf/files.mvme88k,v
retrieving revision 1.43
diff -p -u -r1.43 files.mvme88k
--- mvme88k/conf/files.mvme88k 13 Feb 2009 23:26:50 -0000 1.43
+++ mvme88k/conf/files.mvme88k 6 Dec 2010 18:53:08 -0000
@@ -37,7 +37,7 @@ device dart: tty
attach dart at syscon
file arch/mvme88k/dev/dart.c dart needs-count
-include "../../../scsi/files.scsi"
+include "scsi/files.scsi"
major {sd = 4}
major {st = 5}
Index: mvmeppc/conf/files.mvmeppc
===================================================================
RCS file: /cvs/src/sys/arch/mvmeppc/conf/files.mvmeppc,v
retrieving revision 1.9
diff -p -u -r1.9 files.mvmeppc
--- mvmeppc/conf/files.mvmeppc 8 Mar 2005 20:00:23 -0000 1.9
+++ mvmeppc/conf/files.mvmeppc 6 Dec 2010 18:53:08 -0000
@@ -42,10 +42,10 @@ file arch/mvmeppc/dev/openpic.c
# Various things that need to be included early...
# Media Independent Interface (mii)
-include "../../../dev/mii/files.mii"
+include "dev/mii/files.mii"
# I2O
-include "../../../dev/i2o/files.i2o"
+include "dev/i2o/files.i2o"
#
# ISA Bus support
@@ -87,9 +87,9 @@ file arch/mvmeppc/pci/pcib.c pcib
# Block Devices
#
-include "../../../scsi/files.scsi"
-#include "../../../dev/atapiscsi/files.atapiscsi"
-#include "../../../dev/ata/files.ata"
+include "scsi/files.scsi"
+#include "dev/atapiscsi/files.atapiscsi"
+#include "dev/ata/files.ata"
device bugtty: tty
attach bugtty at mainbus
Index: palm/conf/files.palm
===================================================================
RCS file: /cvs/src/sys/arch/palm/conf/files.palm,v
retrieving revision 1.2
diff -p -u -r1.2 files.palm
--- palm/conf/files.palm 6 Sep 2009 00:51:28 -0000 1.2
+++ palm/conf/files.palm 6 Dec 2010 18:53:09 -0000
@@ -18,8 +18,8 @@ file arch/palm/palm/palm_machdep.c
#
# Machine-independent SCSI drivers
#
-include "../../../scsi/files.scsi"
-include "../../../dev/atapiscsi/files.atapiscsi"
+include "scsi/files.scsi"
+include "dev/atapiscsi/files.atapiscsi"
# CPU support and integrated peripherals
include "arch/arm/xscale/files.pxa2x0"
Index: sparc/conf/files.sparc
===================================================================
RCS file: /cvs/src/sys/arch/sparc/conf/files.sparc,v
retrieving revision 1.87
diff -p -u -r1.87 files.sparc
--- sparc/conf/files.sparc 24 Jul 2010 00:26:50 -0000 1.87
+++ sparc/conf/files.sparc 6 Dec 2010 18:53:09 -0000
@@ -79,7 +79,7 @@ attach sbus at mainbus, iommu, sbus, xbo
file arch/sparc/dev/sbus.c sbus
# Sun specific files
-include "../../../dev/sun/files.sun"
+include "dev/sun/files.sun"
#
# Console (zs) related stuff
@@ -97,12 +97,12 @@ file arch/sparc/dev/z8530kbd.c zskbd ne
#
# Media Independent Interface (mii)
#
-include "../../../dev/mii/files.mii"
+include "dev/mii/files.mii"
#
# Machine-independent SCSI drivers
#
-include "../../../scsi/files.scsi"
+include "scsi/files.scsi"
major {sd = 7}
major {vnd = 8}
@@ -311,7 +311,7 @@ file arch/sparc/sparc/db_disasm.c ddb
#
# SVR4 Binary Compatibility (COMPAT_SVR4)
-include "../../../compat/svr4/files.svr4"
+include "compat/svr4/files.svr4"
file arch/sparc/sparc/svr4_machdep.c compat_svr4
# Magma Serial/Parallel boards
Index: sparc64/conf/files.sparc64
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/conf/files.sparc64,v
retrieving revision 1.130
diff -p -u -r1.130 files.sparc64
--- sparc64/conf/files.sparc64 31 Dec 2009 11:58:41 -0000 1.130
+++ sparc64/conf/files.sparc64 6 Dec 2010 18:53:09 -0000
@@ -84,7 +84,7 @@ include "dev/pcmcia/files.pcmcia"
device zs {[channel = -1]}
# Sun specific files
-include "../../../dev/sun/files.sun"
+include "dev/sun/files.sun"
define iommu
define viommu
@@ -349,7 +349,7 @@ file arch/sparc64/dev/md_root.c memory_d
#
# Machine-independent SCSI drivers
#
-include "../../../scsi/files.scsi"
+include "scsi/files.scsi"
major {sd = 7}
major {vnd = 8}
major {cd = 18}
