summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/alpha/conf/files.alpha6
-rw-r--r--sys/arch/amd64/conf/files.amd644
-rw-r--r--sys/arch/armish/conf/files.armish10
-rw-r--r--sys/arch/aviion/conf/files.aviion4
-rw-r--r--sys/arch/beagle/conf/files.beagle8
-rw-r--r--sys/arch/gumstix/conf/files.gumstix6
-rw-r--r--sys/arch/i386/conf/files.i38630
-rw-r--r--sys/arch/luna88k/conf/files.luna88k4
-rw-r--r--sys/arch/macppc/conf/files.macppc12
-rw-r--r--sys/arch/mvme68k/conf/files.mvme68k4
-rw-r--r--sys/arch/mvme88k/conf/files.mvme88k4
-rw-r--r--sys/arch/mvmeppc/conf/files.mvmeppc12
-rw-r--r--sys/arch/palm/conf/files.palm6
-rw-r--r--sys/arch/sparc/conf/files.sparc10
-rw-r--r--sys/arch/sparc64/conf/files.sparc646
15 files changed, 63 insertions, 63 deletions
diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha
index f3858ab050c..14f80dc1555 100644
--- a/sys/arch/alpha/conf/files.alpha
+++ b/sys/arch/alpha/conf/files.alpha
@@ -1,4 +1,4 @@
-# $OpenBSD: files.alpha,v 1.90 2010/06/30 20:38:49 tedu Exp $
+# $OpenBSD: files.alpha,v 1.91 2010/12/06 20:10:17 jasper Exp $
# $NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $
#
# alpha-specific configuration info
@@ -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
#
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index 5d5931aa8c2..ecaed2f33ea 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.amd64,v 1.59 2010/11/13 04:16:42 guenther Exp $
+# $OpenBSD: files.amd64,v 1.60 2010/12/06 20:10:17 jasper Exp $
maxpartitions 16
maxusers 2 16 128
@@ -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
diff --git a/sys/arch/armish/conf/files.armish b/sys/arch/armish/conf/files.armish
index 7e959c224a6..5ed6b8d971e 100644
--- a/sys/arch/armish/conf/files.armish
+++ b/sys/arch/armish/conf/files.armish
@@ -1,4 +1,4 @@
-# $OpenBSD: files.armish,v 1.13 2009/05/16 05:47:25 deraadt Exp $
+# $OpenBSD: files.armish,v 1.14 2010/12/06 20:10:17 jasper Exp $
maxpartitions 16
maxusers 2 8 64
@@ -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"
#
diff --git a/sys/arch/aviion/conf/files.aviion b/sys/arch/aviion/conf/files.aviion
index 9829595bbc7..ad9b6448a9f 100644
--- a/sys/arch/aviion/conf/files.aviion
+++ b/sys/arch/aviion/conf/files.aviion
@@ -1,4 +1,4 @@
-# $OpenBSD: files.aviion,v 1.7 2010/04/21 19:33:47 miod Exp $
+# $OpenBSD: files.aviion,v 1.8 2010/12/06 20:10:17 jasper Exp $
#
maxpartitions 16
@@ -35,7 +35,7 @@ file arch/aviion/dev/if_ile_syscon.c ile_syscon
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}
diff --git a/sys/arch/beagle/conf/files.beagle b/sys/arch/beagle/conf/files.beagle
index 86d87315148..fcaf182a068 100644
--- a/sys/arch/beagle/conf/files.beagle
+++ b/sys/arch/beagle/conf/files.beagle
@@ -1,4 +1,4 @@
-# $OpenBSD: files.beagle,v 1.4 2010/06/01 03:01:02 drahn Exp $
+# $OpenBSD: files.beagle,v 1.5 2010/12/06 20:10:17 jasper Exp $
#
# First try for arm-specific configuration info
#
@@ -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 omdisplay
#
# 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
diff --git a/sys/arch/gumstix/conf/files.gumstix b/sys/arch/gumstix/conf/files.gumstix
index 0f2880bdc9b..36794b24359 100644
--- a/sys/arch/gumstix/conf/files.gumstix
+++ b/sys/arch/gumstix/conf/files.gumstix
@@ -1,4 +1,4 @@
-# $OpenBSD: files.gumstix,v 1.1 2008/11/26 14:18:11 drahn Exp $
+# $OpenBSD: files.gumstix,v 1.2 2010/12/06 20:10:17 jasper Exp $
#
# First try for arm-specific configuration info
#
@@ -18,8 +18,8 @@ file arch/gumstix/gumstix/gumstix_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"
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 646a765a9ea..c67da345d4e 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-# $OpenBSD: files.i386,v 1.199 2010/10/14 21:23:04 pirofti Exp $
+# $OpenBSD: files.i386,v 1.200 2010/12/06 20:10:18 jasper Exp $
#
# new style config file for i386 architecture
#
@@ -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-flag
# 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
diff --git a/sys/arch/luna88k/conf/files.luna88k b/sys/arch/luna88k/conf/files.luna88k
index d7df73af3ae..86fee4aa4bc 100644
--- a/sys/arch/luna88k/conf/files.luna88k
+++ b/sys/arch/luna88k/conf/files.luna88k
@@ -1,4 +1,4 @@
-# $OpenBSD: files.luna88k,v 1.14 2007/02/09 14:26:09 aoyama Exp $
+# $OpenBSD: files.luna88k,v 1.15 2010/12/06 20:10:18 jasper Exp $
#
maxpartitions 16
@@ -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}
diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc
index 117478a97ab..3bd587c538a 100644
--- a/sys/arch/macppc/conf/files.macppc
+++ b/sys/arch/macppc/conf/files.macppc
@@ -1,4 +1,4 @@
-# $OpenBSD: files.macppc,v 1.62 2010/04/09 19:24:17 jasper Exp $
+# $OpenBSD: files.macppc,v 1.63 2010/12/06 20:10:18 jasper Exp $
#
# macppc-specific configuration info
@@ -26,7 +26,7 @@ file arch/macppc/macppc/db_interface.c ddb
#
# 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
diff --git a/sys/arch/mvme68k/conf/files.mvme68k b/sys/arch/mvme68k/conf/files.mvme68k
index 5d055dece26..3964a0b648f 100644
--- a/sys/arch/mvme68k/conf/files.mvme68k
+++ b/sys/arch/mvme68k/conf/files.mvme68k
@@ -1,4 +1,4 @@
-# $OpenBSD: files.mvme68k,v 1.34 2010/06/29 20:30:33 guenther Exp $
+# $OpenBSD: files.mvme68k,v 1.35 2010/12/06 20:10:18 jasper Exp $
# config file for mvme68k
@@ -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
diff --git a/sys/arch/mvme88k/conf/files.mvme88k b/sys/arch/mvme88k/conf/files.mvme88k
index fa24f6fef6f..f0485f3e52d 100644
--- a/sys/arch/mvme88k/conf/files.mvme88k
+++ b/sys/arch/mvme88k/conf/files.mvme88k
@@ -1,4 +1,4 @@
-# $OpenBSD: files.mvme88k,v 1.43 2009/02/13 23:26:50 miod Exp $
+# $OpenBSD: files.mvme88k,v 1.44 2010/12/06 20:10:18 jasper Exp $
#
maxpartitions 16
@@ -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}
diff --git a/sys/arch/mvmeppc/conf/files.mvmeppc b/sys/arch/mvmeppc/conf/files.mvmeppc
index 96f206d1895..89827e5f3f7 100644
--- a/sys/arch/mvmeppc/conf/files.mvmeppc
+++ b/sys/arch/mvmeppc/conf/files.mvmeppc
@@ -1,4 +1,4 @@
-# $OpenBSD: files.mvmeppc,v 1.9 2005/03/08 20:00:23 tdeval Exp $
+# $OpenBSD: files.mvmeppc,v 1.10 2010/12/06 20:10:18 jasper Exp $
#
# mvmeppc-specific configuration info
@@ -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
diff --git a/sys/arch/palm/conf/files.palm b/sys/arch/palm/conf/files.palm
index bb756a8db84..22b0265691d 100644
--- a/sys/arch/palm/conf/files.palm
+++ b/sys/arch/palm/conf/files.palm
@@ -1,4 +1,4 @@
-# $OpenBSD: files.palm,v 1.2 2009/09/06 00:51:28 marex Exp $
+# $OpenBSD: files.palm,v 1.3 2010/12/06 20:10:18 jasper Exp $
#
# First try for arm-specific configuration info
#
@@ -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"
diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc
index b190d767f5d..8092cffc8ba 100644
--- a/sys/arch/sparc/conf/files.sparc
+++ b/sys/arch/sparc/conf/files.sparc
@@ -1,4 +1,4 @@
-# $OpenBSD: files.sparc,v 1.87 2010/07/24 00:26:50 jakemsr Exp $
+# $OpenBSD: files.sparc,v 1.88 2010/12/06 20:10:18 jasper Exp $
# $NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $
# @(#)files.sparc 8.1 (Berkeley) 7/19/93
@@ -79,7 +79,7 @@ attach sbus at mainbus, iommu, sbus, xbox
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 needs-flag
#
# 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
diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64
index 50a2305cc02..f8b41c3db85 100644
--- a/sys/arch/sparc64/conf/files.sparc64
+++ b/sys/arch/sparc64/conf/files.sparc64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.sparc64,v 1.130 2009/12/31 11:58:41 kettenis Exp $
+# $OpenBSD: files.sparc64,v 1.131 2010/12/06 20:10:18 jasper Exp $
# $NetBSD: files.sparc64,v 1.50 2001/08/10 20:53:50 eeh Exp $
# maxpartitions must be first item in files.${ARCH}
@@ -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_disk_hooks
#
# Machine-independent SCSI drivers
#
-include "../../../scsi/files.scsi"
+include "scsi/files.scsi"
major {sd = 7}
major {vnd = 8}
major {cd = 18}