diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/cardbus/cardbus.c | 7 | ||||
| -rw-r--r-- | sys/dev/cardbus/files.cardbus | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index 316f3ba4477..59f56fb2456 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: cardbus.c,v 1.66 2005/09/09 14:50:58 drochner Exp $ */ +/* $NetBSD: cardbus.c,v 1.67 2005/10/25 16:37:50 drochner Exp $ */ /* * Copyright (c) 1997, 1998, 1999 and 2000 @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.66 2005/09/09 14:50:58 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.67 2005/10/25 16:37:50 drochner Exp $"); #include "opt_cardbus.h" @@ -386,7 +386,7 @@ cardbus_attach_card(struct cardbus_softc *sc) cardbus_function_tag_t cf; int cdstatus; static int wildcard[CARDBUSCF_NLOCS] = { - CARDBUSCF_DEV_DEFAULT, CARDBUSCF_FUNCTION_DEFAULT + CARDBUSCF_FUNCTION_DEFAULT }; cc = sc->sc_cc; @@ -581,7 +581,6 @@ cardbus_rescan(struct device *self, const char *ifattr, const int *locators) } } - locs[CARDBUSCF_DEV] = 0; locs[CARDBUSCF_FUNCTION] = function; if ((csc = config_found_sm_loc((void *)sc, "cardbus", locs, diff --git a/sys/dev/cardbus/files.cardbus b/sys/dev/cardbus/files.cardbus index 10e221cc42f..c9b83728491 100644 --- a/sys/dev/cardbus/files.cardbus +++ b/sys/dev/cardbus/files.cardbus @@ -1,4 +1,4 @@ -# $NetBSD: files.cardbus,v 1.30 2005/07/24 08:48:03 augustss Exp $ +# $NetBSD: files.cardbus,v 1.31 2005/10/25 16:37:50 drochner Exp $ # # files.cardbus # @@ -8,7 +8,7 @@ attach cardslot at pcmciaslot file dev/cardbus/cardslot.c cardslot needs-flag defflag opt_cardslot.h CARDSLOT_DEBUG -device cardbus {[dev = -1], [function = -1]} +device cardbus {[function = -1]} attach cardbus at cbbus file dev/cardbus/cardbus.c cardbus needs-flag file dev/cardbus/cardbus_map.c cardbus |
