3 files changed, 5 insertions, 20 deletions
diff --git a/sys/dev/cardbus/if_atw_cardbus.c b/sys/dev/cardbus/if_atw_cardbus.c
index a7745151715..b0e57497e76 100644
--- a/sys/dev/cardbus/if_atw_cardbus.c
+++ b/sys/dev/cardbus/if_atw_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_atw_cardbus.c,v 1.1 2004/06/22 23:55:23 millert Exp $	*/
+/*	$OpenBSD: if_atw_cardbus.c,v 1.2 2004/07/15 15:39:41 millert Exp $	*/
 /*	$NetBSD: if_atw_cardbus.c,v 1.7 2004/05/08 23:40:01 dyoung Exp $	*/
 
 /*-
@@ -133,8 +133,6 @@ int	atw_cardbus_enable(struct atw_softc *);
 void	atw_cardbus_disable(struct atw_softc *);
 void	atw_cardbus_power(struct atw_softc *, int);
 
-void	atw_cardbus_intr_ack(struct atw_softc *);
-
 const struct atw_cardbus_product *atw_cardbus_lookup
    (const struct cardbus_attach_args *);
 
@@ -203,8 +201,6 @@ atw_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	sc->sc_disable = atw_cardbus_disable;
 	sc->sc_power = atw_cardbus_power;
 
-	sc->sc_intr_ack = atw_cardbus_intr_ack;
-
 	/* Get revision info. */
 	rev = PCI_REVISION(ca->ca_class);
 
@@ -285,12 +281,6 @@ atw_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	Cardbus_function_disable(csc->sc_ct);
 }
 
-void
-atw_cardbus_intr_ack(struct atw_softc *sc)
-{
-	ATW_WRITE(sc, ATW_FER, ATW_FER_INTR);
-}
-
 int
 atw_cardbus_detach(struct device *self, int flags)
 {
diff --git a/sys/dev/ic/atw.c b/sys/dev/ic/atw.c
index 7c56561347b..29f4b94aa7b 100644
--- a/sys/dev/ic/atw.c
+++ b/sys/dev/ic/atw.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: atw.c,v 1.16 2004/07/15 15:28:59 millert Exp $	*/
-/*	$NetBSD: atw.c,v 1.59 2004/07/15 07:19:46 dyoung Exp $	*/
+/*	$OpenBSD: atw.c,v 1.17 2004/07/15 15:39:40 millert Exp $	*/
+/*	$NetBSD: atw.c,v 1.60 2004/07/15 07:20:46 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__NetBSD__)
-__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.59 2004/07/15 07:19:46 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.60 2004/07/15 07:20:46 dyoung Exp $");
 #endif
 
 #include "bpfilter.h"
@@ -1187,8 +1187,6 @@ atw_init(struct ifnet *ifp)
 
 	ATW_WRITE(sc, ATW_IER, sc->sc_inten);
 	ATW_WRITE(sc, ATW_STSR, 0xffffffff);
-	if (sc->sc_intr_ack != NULL)
-		(*sc->sc_intr_ack)(sc);
 
 	DPRINTF(sc, ("%s: ATW_IER %08x, inten %08x\n",
 	    sc->sc_dev.dv_xname, ATW_READ(sc, ATW_IER), sc->sc_inten));
diff --git a/sys/dev/ic/atwvar.h b/sys/dev/ic/atwvar.h
index 4f8d6ea21f6..60baaccef1f 100644
--- a/sys/dev/ic/atwvar.h
+++ b/sys/dev/ic/atwvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atwvar.h,v 1.3 2004/07/15 12:00:31 millert Exp $	*/
+/*	$OpenBSD: atwvar.h,v 1.4 2004/07/15 15:39:41 millert Exp $	*/
 /*	$NetBSD: atwvar.h,v 1.10 2004/07/15 06:06:53 dyoung Exp $	*/
 
 /*
@@ -254,9 +254,6 @@ struct atw_softc {
 	u_int32_t	sc_txint_mask;	/* mask of Tx interrupts we want */
 	u_int32_t	sc_linkint_mask;/* link-state interrupts mask */
 
-	/* interrupt acknowledge hook */
-	void (*sc_intr_ack)(struct atw_softc *);
-
 	enum atw_rftype		sc_rftype;
 	enum atw_bbptype	sc_bbptype;
 	u_int32_t	sc_synctl_rd;