diff --git a/sys/dev/cardbus/if_ex_cardbus.c b/sys/dev/cardbus/if_ex_cardbus.c index adb41c8949cc..b4599238596a 100644 --- a/sys/dev/cardbus/if_ex_cardbus.c +++ b/sys/dev/cardbus/if_ex_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ex_cardbus.c,v 1.53 2010/03/22 17:23:44 dyoung Exp $ */ +/* $NetBSD: if_ex_cardbus.c,v 1.54 2010/03/22 23:03:30 dyoung Exp $ */ /* * Copyright (c) 1998 and 1999 @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.53 2010/03/22 17:23:44 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.54 2010/03/22 23:03:30 dyoung Exp $"); /* #define EX_DEBUG 4 */ /* define to report information for debugging */ @@ -221,7 +221,6 @@ ex_cardbus_attach(device_t parent, device_t self, void *aux) sc->sc_dev = self; - sc->ex_bustype = EX_BUS_CARDBUS; sc->sc_dmat = ca->ca_dmat; csc->sc_ct = ca->ca_ct; csc->sc_intrline = ca->ca_intrline; diff --git a/sys/dev/ic/elinkxlvar.h b/sys/dev/ic/elinkxlvar.h index bcfc8e3d7668..ed33fdfa396b 100644 --- a/sys/dev/ic/elinkxlvar.h +++ b/sys/dev/ic/elinkxlvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: elinkxlvar.h,v 1.21 2010/03/22 17:11:19 dyoung Exp $ */ +/* $NetBSD: elinkxlvar.h,v 1.22 2010/03/22 23:03:30 dyoung Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -109,11 +109,6 @@ struct ex_softc { #define EX_FLAGS_POWERMGMT 0x2000 #define EX_FLAGS_ATTACHED 0x4000 /* attach has succeeded */ - u_char ex_bustype; /* parent bus type (currently unused) */ - -#define EX_BUS_PCI 0 -#define EX_BUS_CARDBUS 1 - #if NRND > 0 rndsource_element_t rnd_source; #endif diff --git a/sys/dev/pci/if_ex_pci.c b/sys/dev/pci/if_ex_pci.c index b545b67a369e..c3c6f754c085 100644 --- a/sys/dev/pci/if_ex_pci.c +++ b/sys/dev/pci/if_ex_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ex_pci.c,v 1.52 2010/03/22 17:20:42 dyoung Exp $ */ +/* $NetBSD: if_ex_pci.c,v 1.53 2010/03/22 23:03:30 dyoung Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.52 2010/03/22 17:20:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.53 2010/03/22 23:03:30 dyoung Exp $"); #include #include @@ -233,7 +233,6 @@ ex_pci_attach(device_t parent, device_t self, void *aux) sc->sc_dmat = pa->pa_dmat; - sc->ex_bustype = EX_BUS_PCI; sc->ex_conf = epp->epp_flags; /* Enable the card. */