diff options
| author | ad <ad@NetBSD.org> | 2008-03-29 16:36:14 +0000 |
|---|---|---|
| committer | ad <ad@NetBSD.org> | 2008-03-29 16:36:14 +0000 |
| commit | bd1204e3c895ffac27c633a507915bda4ef555eb (patch) | |
| tree | 0df0a2ad6ee662a9df5201dbb363a2d44f2eabca /sys/dev | |
| parent | 64e7d595e19f7e4c3b22a540901b3e41559a1af1 (diff) | |
Make it compile again.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/cardbus/fwohci_cardbus.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/fwohci_pci.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/cardbus/fwohci_cardbus.c b/sys/dev/cardbus/fwohci_cardbus.c index ffdcb6cd03c..68dd8185f6a 100644 --- a/sys/dev/cardbus/fwohci_cardbus.c +++ b/sys/dev/cardbus/fwohci_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwohci_cardbus.c,v 1.21 2007/11/06 15:24:11 kiyohara Exp $ */ +/* $NetBSD: fwohci_cardbus.c,v 1.22 2008/03/29 16:36:14 ad Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwohci_cardbus.c,v 1.21 2007/11/06 15:24:11 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwohci_cardbus.c,v 1.22 2008/03/29 16:36:14 ad Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -152,7 +152,7 @@ XXX (ct->ct_cf->cardbus_mem_open)(cc, 0, iob, iob + 0x40); printf("%s: interrupting at %d\n", devname, ca->ca_intrline); /* XXX NULL should be replaced by some call to Cardbus coed */ - if (fwohci_init(&sc->sc_sc, &(sc->sc_sc.fc._dev)) != 0) { + if (fwohci_init(&sc->sc_sc, sc->sc_sc.fc.dev) != 0) { cardbus_intr_disestablish(cc, cf, sc->sc_ih); sc->sc_ih = NULL; } diff --git a/sys/dev/pci/fwohci_pci.c b/sys/dev/pci/fwohci_pci.c index bb8d49f26b9..1d28990fd12 100644 --- a/sys/dev/pci/fwohci_pci.c +++ b/sys/dev/pci/fwohci_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwohci_pci.c,v 1.29 2008/02/29 06:13:39 dyoung Exp $ */ +/* $NetBSD: fwohci_pci.c,v 1.30 2008/03/29 16:37:00 ad Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.29 2008/02/29 06:13:39 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.30 2008/03/29 16:37:00 ad Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -148,7 +148,7 @@ fwohci_pci_attach(struct device *parent, struct device *self, if (!pmf_device_register(self, fwohci_pci_suspend, fwohci_pci_resume)) aprint_error_dev(self, "couldn't establish power handler\n"); - if (fwohci_init(&(psc->psc_sc), &(psc->psc_sc.fc._dev)) != 0) { + if (fwohci_init(&(psc->psc_sc), psc->psc_sc.fc.dev) != 0) { pci_intr_disestablish(pa->pa_pc, psc->psc_ih); bus_space_unmap(psc->psc_sc.bst, psc->psc_sc.bsh, psc->psc_sc.bssize); |
