summaryrefslogtreecommitdiff
path: root/sys/arch/hppa/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/hppa/dev')
-rw-r--r--sys/arch/hppa/dev/cpu.c4
-rw-r--r--sys/arch/hppa/dev/mongoose.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/hppa/dev/cpu.c b/sys/arch/hppa/dev/cpu.c
index 932ba6cac42..9ea23a6e156 100644
--- a/sys/arch/hppa/dev/cpu.c
+++ b/sys/arch/hppa/dev/cpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.c,v 1.21 2003/03/29 00:52:45 mickey Exp $ */
+/* $OpenBSD: cpu.c,v 1.22 2003/08/07 19:47:33 mickey Exp $ */
/*
* Copyright (c) 1998-2002 Michael Shalayeff
@@ -190,7 +190,7 @@ cpuattach(parent, self, aux)
/* sanity against lusers amongst config editors */
if (ca->ca_irq == 31)
sc->sc_ih = cpu_intr_establish(IPL_CLOCK, ca->ca_irq,
- cpu_hardclock, NULL /*frame*/, &sc->sc_dev);
+ cpu_hardclock, NULL /*frame*/, sc->sc_dev.dv_xname);
else
printf ("%s: bad irq %d\n", sc->sc_dev.dv_xname, ca->ca_irq);
}
diff --git a/sys/arch/hppa/dev/mongoose.c b/sys/arch/hppa/dev/mongoose.c
index 0dda370bd10..87af6fb4aa9 100644
--- a/sys/arch/hppa/dev/mongoose.c
+++ b/sys/arch/hppa/dev/mongoose.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mongoose.c,v 1.12 2003/05/11 19:41:09 deraadt Exp $ */
+/* $OpenBSD: mongoose.c,v 1.13 2003/08/07 19:47:33 mickey Exp $ */
/*
* Copyright (c) 1998,1999 Michael Shalayeff
@@ -251,7 +251,7 @@ mg_isa_attach_hook(struct device *parent, struct device *self,
void *
mg_intr_establish(void *v, int irq, int type, int pri,
- int (*handler)(void *), void *arg, char *name)
+ int (*handler)(void *), void *arg, const char *name)
{
struct hppa_isa_iv *iv;
struct mongoose_softc *sc = v;
@@ -652,7 +652,7 @@ mgattach(parent, self, aux)
/* attach interrupt */
sc->sc_ih = cpu_intr_establish(IPL_HIGH, ca->ca_irq,
- mg_intr, sc, &sc->sc_dev);
+ mg_intr, sc, sc->sc_dev.dv_xname);
}
int