diff options
Diffstat (limited to 'sys')
-rw-r--r-- | sys/arch/arm64/arm64/bus_space.c (renamed from sys/arch/arm64/dev/arm64_bus_space.c) | 2 | ||||
-rw-r--r-- | sys/arch/arm64/conf/files.arm64 | 4 | ||||
-rw-r--r-- | sys/arch/octeon/conf/files.octeon | 4 | ||||
-rw-r--r-- | sys/arch/octeon/octeon/bus_space.c (renamed from sys/arch/octeon/dev/octeon_bus_space.c) | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/arm64/dev/arm64_bus_space.c b/sys/arch/arm64/arm64/bus_space.c index f78905fb47c..a0adfc49e95 100644 --- a/sys/arch/arm64/dev/arm64_bus_space.c +++ b/sys/arch/arm64/arm64/bus_space.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arm64_bus_space.c,v 1.9 2024/07/03 21:04:04 kettenis Exp $ */ +/* $OpenBSD: bus_space.c,v 1.1 2024/11/12 04:56:27 jsg Exp $ */ /* * Copyright (c) 2001-2003 Opsycon AB (www.opsycon.se / www.opsycon.com) diff --git a/sys/arch/arm64/conf/files.arm64 b/sys/arch/arm64/conf/files.arm64 index 8e66b684544..b2509fae344 100644 --- a/sys/arch/arm64/conf/files.arm64 +++ b/sys/arch/arm64/conf/files.arm64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.arm64,v 1.71 2024/11/04 21:46:13 jsg Exp $ +# $OpenBSD: files.arm64,v 1.72 2024/11/12 04:56:27 jsg Exp $ maxpartitions 16 maxusers 2 8 128 @@ -37,8 +37,8 @@ file arch/arm64/arm64/cpufunc_asm.S file arch/arm64/arm64/lse.S file arch/arm64/arm64/support.S file arch/arm64/arm64/bus_dma.c +file arch/arm64/arm64/bus_space.c -file arch/arm64/dev/arm64_bus_space.c file arch/arm64/dev/pci_machdep.c file arch/arm64/arm64/cryptox.c crypto diff --git a/sys/arch/octeon/conf/files.octeon b/sys/arch/octeon/conf/files.octeon index e11ae434ede..4efff4ebce5 100644 --- a/sys/arch/octeon/conf/files.octeon +++ b/sys/arch/octeon/conf/files.octeon @@ -1,4 +1,4 @@ -# $OpenBSD: files.octeon,v 1.59 2024/01/01 18:25:50 kettenis Exp $ +# $OpenBSD: files.octeon,v 1.60 2024/11/12 04:56:27 jsg Exp $ # Standard stanzas config(8) can't run without maxpartitions 16 @@ -15,6 +15,7 @@ major { amdcf = 19 } file dev/cninit.c file arch/octeon/octeon/autoconf.c file arch/octeon/octeon/bus_dma.c +file arch/octeon/octeon/bus_space.c file arch/octeon/octeon/conf.c file arch/octeon/octeon/disksubr.c disk file arch/octeon/octeon/machdep.c @@ -128,7 +129,6 @@ file arch/octeon/dev/cn30xxuart.c octuart device pcibus attach pcibus at iobus file arch/octeon/dev/octeon_pcibus.c pcibus -file arch/octeon/dev/octeon_bus_space.c device octpcie: pcibus attach octpcie at iobus diff --git a/sys/arch/octeon/dev/octeon_bus_space.c b/sys/arch/octeon/octeon/bus_space.c index 7fb70165326..c3100907d56 100644 --- a/sys/arch/octeon/dev/octeon_bus_space.c +++ b/sys/arch/octeon/octeon/bus_space.c @@ -1,4 +1,4 @@ -/* $OpenBSD: octeon_bus_space.c,v 1.1 2010/10/28 22:52:10 syuu Exp $ */ +/* $OpenBSD: bus_space.c,v 1.1 2024/11/12 04:56:27 jsg Exp $ */ /* * Copyright (c) 2001-2003 Opsycon AB (www.opsycon.se / www.opsycon.com) |