summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2013-03-26 18:46:56 +0000
committerJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2013-03-26 18:46:56 +0000
commit9d9ec46729101ab02560e10d83a581635fcc035d (patch)
tree1e201d90245492b3ef554ee9abef3cd9b5030b47
parentfd4eea4f9a5f39376c830bea7ab4d0b0cafa7a66 (diff)
move octcf bits together
-rw-r--r--sys/arch/octeon/conf/files.octeon7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/octeon/conf/files.octeon b/sys/arch/octeon/conf/files.octeon
index b399bdff816..59965214723 100644
--- a/sys/arch/octeon/conf/files.octeon
+++ b/sys/arch/octeon/conf/files.octeon
@@ -1,4 +1,4 @@
-# $OpenBSD: files.octeon,v 1.12 2013/02/03 22:35:52 bcallah Exp $
+# $OpenBSD: files.octeon,v 1.13 2013/03/26 18:46:55 jasper Exp $
# Standard stanzas config(8) can't run without
maxpartitions 16
@@ -66,6 +66,8 @@ file arch/octeon/dev/cn30xxsmi.c iobus
# On-board CF
device octcf: disk
+attach octcf at iobus
+file arch/octeon/dev/octcf.c octcf
device cn30xxgmx {}
attach cn30xxgmx at iobus
@@ -75,9 +77,6 @@ device cnmac: ether, ifnet, mii, ifmedia
attach cnmac at cn30xxgmx
file arch/octeon/dev/if_cnmac.c cnmac
-attach octcf at iobus
-file arch/octeon/dev/octcf.c octcf
-
define uartbus {[base = -1]}
device uartbus
attach uartbus at mainbus