summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2007-04-16 14:33:36 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2007-04-16 14:33:36 +0000
commit4d1d14bef70e1c72dd6e326646e91646c9a4405b (patch)
treed22b8f7cba1cad6118e1e2dde9a4d1f26e635b55 /sys
parentc274139e37d9ade0146c7091167e016223bcc371 (diff)
sigh, move tht autoconf stuff after thtc autoconf stuff. it will work
better this way
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/if_tht.c46
1 files changed, 23 insertions, 23 deletions
diff --git a/sys/dev/pci/if_tht.c b/sys/dev/pci/if_tht.c
index 89aea3e715b..e52c1c2d003 100644
--- a/sys/dev/pci/if_tht.c
+++ b/sys/dev/pci/if_tht.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_tht.c,v 1.9 2007/04/16 14:32:19 dlg Exp $ */
+/* $OpenBSD: if_tht.c,v 1.10 2007/04/16 14:33:35 dlg Exp $ */
/*
* Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -61,28 +61,6 @@
#define THT_PORT_SIZE 0x8000
#define THT_PORT_REGION(_p) ((_p) * THT_PORT_SIZE)
-/* port autoconf glue */
-
-struct tht_softc {
- struct device sc_dev;
-
- void *sc_ih;
-
- bus_space_handle_t sc_memh;
-};
-
-int tht_match(struct device *, void *, void *);
-void tht_attach(struct device *, struct device *, void *);
-int tht_intr(void *);
-
-struct cfattach tht_ca = {
- sizeof(struct tht_softc), tht_match, tht_attach
-};
-
-struct cfdriver tht_cd = {
- NULL, "tht", DV_IFNET
-};
-
/* pci controller autoconf glue */
struct thtc_softc {
@@ -107,6 +85,28 @@ struct cfdriver thtc_cd = {
NULL, "thtc", DV_DULL
};
+/* port autoconf glue */
+
+struct tht_softc {
+ struct device sc_dev;
+
+ void *sc_ih;
+
+ bus_space_handle_t sc_memh;
+};
+
+int tht_match(struct device *, void *, void *);
+void tht_attach(struct device *, struct device *, void *);
+int tht_intr(void *);
+
+struct cfattach tht_ca = {
+ sizeof(struct tht_softc), tht_match, tht_attach
+};
+
+struct cfdriver tht_cd = {
+ NULL, "tht", DV_IFNET
+};
+
/* glue between the controller and the port */
struct tht_attach_args {