summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorNathan Binkert <nate@cvs.openbsd.org>2002-01-03 20:28:03 +0000
committerNathan Binkert <nate@cvs.openbsd.org>2002-01-03 20:28:03 +0000
commitf0f2b3db52a423a6450d83d44c608ebe12f6a193 (patch)
tree541e2b33ba55d0323815fa325bf44fcbc4123cab /sys
parent402ac960de04de94928663b2aa4fed7d87bb2b28 (diff)
Add the bus to the cardbus_attach_args
From NetBSD
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/cardbus/cardbus.c3
-rw-r--r--sys/dev/cardbus/cardbusvar.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index 5dc3cab44be..7d8f2c5360d 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cardbus.c,v 1.3 2001/06/24 21:29:05 mickey Exp $ */
+/* $OpenBSD: cardbus.c,v 1.4 2002/01/03 20:28:02 nate Exp $ */
/* $NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $ */
/*
@@ -501,6 +501,7 @@ cardbus_attach_card(sc)
ca.ca_dmat = sc->sc_dmat;
ca.ca_tag = tag;
+ ca.ca_bus = sc->sc_bus;
ca.ca_device = sc->sc_device;
ca.ca_function = function;
ca.ca_id = id;
diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h
index 70c9d6b8f5b..e5330f97c7f 100644
--- a/sys/dev/cardbus/cardbusvar.h
+++ b/sys/dev/cardbus/cardbusvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cardbusvar.h,v 1.3 2000/05/15 06:36:21 niklas Exp $ */
+/* $OpenBSD: cardbusvar.h,v 1.4 2002/01/03 20:28:02 nate Exp $ */
/* $NetBSD: cardbusvar.h,v 1.17 2000/04/02 19:11:37 mycroft Exp $ */
/*
@@ -349,6 +349,7 @@ struct cardbus_attach_args {
bus_space_tag_t ca_memt; /* CardBus MEM space tag */
bus_dma_tag_t ca_dmat; /* DMA tag */
+ u_int ca_bus;
u_int ca_device;
u_int ca_function;
cardbustag_t ca_tag;