diff options
Diffstat (limited to 'sys/arch/hppa')
| -rw-r--r-- | sys/arch/hppa/dev/apic.c | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/dino.c | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/elroyvar.h | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/include/pci_machdep.h | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/hppa/dev/apic.c b/sys/arch/hppa/dev/apic.c index 7e8bc7f684d..58c48bc62dc 100644 --- a/sys/arch/hppa/dev/apic.c +++ b/sys/arch/hppa/dev/apic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apic.c,v 1.7 2007/10/06 23:50:54 krw Exp $ */ +/* $OpenBSD: apic.c,v 1.8 2009/08/22 02:54:50 mk Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -149,7 +149,7 @@ apic_intr_string(void *v, pci_intr_handle_t ih) void * apic_intr_establish(void *v, pci_intr_handle_t ih, - int pri, int (*handler)(void *), void *arg, char *name) + int pri, int (*handler)(void *), void *arg, const char *name) { struct elroy_softc *sc = v; volatile struct elroy_regs *r = sc->sc_regs; diff --git a/sys/arch/hppa/dev/dino.c b/sys/arch/hppa/dev/dino.c index 5af79ba4e5b..e06acfdf213 100644 --- a/sys/arch/hppa/dev/dino.c +++ b/sys/arch/hppa/dev/dino.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dino.c,v 1.25 2009/03/30 21:24:57 kettenis Exp $ */ +/* $OpenBSD: dino.c,v 1.26 2009/08/22 02:54:50 mk Exp $ */ /* * Copyright (c) 2003-2005 Michael Shalayeff @@ -165,7 +165,7 @@ void dino_conf_write(void *, pcitag_t, int, pcireg_t); int dino_intr_map(struct pci_attach_args *, pci_intr_handle_t *); const char *dino_intr_string(void *, pci_intr_handle_t); void * dino_intr_establish(void *, pci_intr_handle_t, int, int (*)(void *), - void *, char *); + void *, const char *); void dino_intr_disestablish(void *, void *); int dino_iomap(void *, bus_addr_t, bus_size_t, int, bus_space_handle_t *); int dino_memmap(void *, bus_addr_t, bus_size_t, int, bus_space_handle_t *); @@ -391,7 +391,7 @@ dino_intr_string(void *v, pci_intr_handle_t ih) void * dino_intr_establish(void *v, pci_intr_handle_t ih, - int pri, int (*handler)(void *), void *arg, char *name) + int pri, int (*handler)(void *), void *arg, const char *name) { struct dino_softc *sc = v; volatile struct dino_regs *r = sc->sc_regs; diff --git a/sys/arch/hppa/dev/elroyvar.h b/sys/arch/hppa/dev/elroyvar.h index 157ad204a7d..f7c6d5c9dc9 100644 --- a/sys/arch/hppa/dev/elroyvar.h +++ b/sys/arch/hppa/dev/elroyvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: elroyvar.h,v 1.3 2007/06/17 14:51:21 kettenis Exp $ */ +/* $OpenBSD: elroyvar.h,v 1.4 2009/08/22 02:54:50 mk Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -50,7 +50,7 @@ int apic_intr(void *v); int apic_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp); const char *apic_intr_string(void *v, pci_intr_handle_t ih); void *apic_intr_establish(void *v, pci_intr_handle_t ih, int pri, - int (*handler)(void *), void *arg, char *name); + int (*handler)(void *), void *arg, const char *name); void apic_intr_disestablish(void *v, void *cookie); void elroy_write32(volatile u_int32_t *p, u_int32_t v); diff --git a/sys/arch/hppa/include/pci_machdep.h b/sys/arch/hppa/include/pci_machdep.h index 859bfc029dd..717fb519931 100644 --- a/sys/arch/hppa/include/pci_machdep.h +++ b/sys/arch/hppa/include/pci_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.h,v 1.4 2009/07/20 23:40:43 miod Exp $ */ +/* $OpenBSD: pci_machdep.h,v 1.5 2009/08/22 02:54:50 mk Exp $ */ /* * Copyright (c) 2003 Michael Shalayeff @@ -53,7 +53,7 @@ struct hppa_pci_chipset_tag { pci_intr_handle_t *); const char *(*pc_intr_string)(void *, pci_intr_handle_t); void *(*pc_intr_establish)(void *, pci_intr_handle_t, - int, int (*)(void *), void *, char *); + int, int (*)(void *), void *, const char *); void (*pc_intr_disestablish)(void *, void *); void *(*pc_alloc_parent)(struct device *, |