summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/pci/gtp.c3
-rw-r--r--sys/dev/pcmcia/esp_pcmcia.c9
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/pci/gtp.c b/sys/dev/pci/gtp.c
index f09ef0d269c..d25cecf78bd 100644
--- a/sys/dev/pci/gtp.c
+++ b/sys/dev/pci/gtp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gtp.c,v 1.2 2005/08/09 04:10:11 mickey Exp $ */
+/* $OpenBSD: gtp.c,v 1.3 2006/04/20 20:30:29 miod Exp $ */
/*
* Copyright (c) 2002 Vladimir Popov <jumbo@narod.ru>
@@ -134,7 +134,6 @@ gtp_attach(struct device *parent, struct device *self, void *aux)
struct gtp_softc *sc = (struct gtp_softc *) self;
struct pci_attach_args *pa = aux;
struct cfdata *cf = sc->sc_dev.dv_cfdata;
- pci_chipset_tag_t pc = pa->pa_pc;
if (pci_mapreg_map(pa, 0x10, PCI_MAPREG_TYPE_IO, 0, &sc->tea.iot,
&sc->tea.ioh, NULL, NULL, 0)) {
diff --git a/sys/dev/pcmcia/esp_pcmcia.c b/sys/dev/pcmcia/esp_pcmcia.c
index 8d7e2f2c3fc..3cd5911ebef 100644
--- a/sys/dev/pcmcia/esp_pcmcia.c
+++ b/sys/dev/pcmcia/esp_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: esp_pcmcia.c,v 1.5 2005/01/27 17:04:55 millert Exp $ */
+/* $OpenBSD: esp_pcmcia.c,v 1.6 2006/04/20 20:30:28 miod Exp $ */
/* $NetBSD: esp_pcmcia.c,v 1.8 2000/06/05 15:36:45 tsutsui Exp $ */
/*-
@@ -196,13 +196,14 @@ esp_pcmcia_attach(parent, self, aux)
goto iomap_failed;
}
- printf(" port 0x%lx/%d", esc->sc_pcioh.addr, esc->sc_pcioh.size);
+ printf(" port 0x%lx/%lu", esc->sc_pcioh.addr,
+ (u_long)esc->sc_pcioh.size);
esp_pcmcia_init(esc);
esc->sc_ih = pcmcia_intr_establish(esc->sc_pf, IPL_BIO,
- ncr53c9x_intr, &esc->sc_ncr53c9x, esc->sc_dev.dv_xname);
- intrstr = pcmcia_intr_string(psc->sc_pf, esc->sc_ih);
+ ncr53c9x_intr, &esc->sc_ncr53c9x, sc->sc_dev.dv_xname);
+ intrstr = pcmcia_intr_string(esc->sc_pf, esc->sc_ih);
if (esc->sc_ih == NULL) {
printf(", %s\n", intrstr);
goto iomap_failed;