summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Glocker <mglocker@cvs.openbsd.org>2007-03-04 11:06:08 +0000
committerMarcus Glocker <mglocker@cvs.openbsd.org>2007-03-04 11:06:08 +0000
commit795aed4ab42c0e70ec535fc9c77a74d92664a9e6 (patch)
tree94c2c35f677d801eec0c5257c9742fdc7d95d494
parent549612831b03ea7af5c8d79d2df461abd7001597 (diff)
Use CARDBUS_PRODUCT macro to read product id.
-rw-r--r--sys/dev/cardbus/if_bcw_cardbus.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/cardbus/if_bcw_cardbus.c b/sys/dev/cardbus/if_bcw_cardbus.c
index 9782db0cdb5..ee8d701f49d 100644
--- a/sys/dev/cardbus/if_bcw_cardbus.c
+++ b/sys/dev/cardbus/if_bcw_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bcw_cardbus.c,v 1.11 2007/03/04 00:43:25 mglocker Exp $ */
+/* $OpenBSD: if_bcw_cardbus.c,v 1.12 2007/03/04 11:06:07 mglocker Exp $ */
/*
* Copyright (c) 2006 Jon Simola <jsimola@gmail.com>
@@ -137,9 +137,9 @@ bcw_cardbus_attach(struct device *parent, struct device *self, void *aux)
* Get some cardbus info into the softc
*/
sc->sc_board_vendor = CARDBUS_VENDOR(ca->ca_id);
- sc->sc_board_type = sc->sc_conf_read(sc, 0x2e);
+ sc->sc_prodid = CARDBUS_PRODUCT(ca->ca_id); /* XXX */
+ sc->sc_board_type = sc->sc_prodid; /* XXX */
sc->sc_board_rev = CARDBUS_REVISION(ca->ca_class);
- sc->sc_prodid = CARDBUS_PRODUCT(ca->ca_id);
#if 0
error = bcw_attach(sc);