From f81ef8a162cd3bd0776ffb4d53a5d14df2e72a7e Mon Sep 17 00:00:00 2001 From: bsh Date: Fri, 6 Apr 2012 01:47:15 +0000 Subject: avoid warning with options PLCOM_DEBUG for INTEGRATOR. --- sys/arch/evbarm/conf/INTEGRATOR | 3 ++- sys/arch/evbarm/dev/plcom.c | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/arch/evbarm/conf/INTEGRATOR b/sys/arch/evbarm/conf/INTEGRATOR index 4939b688690..51bbfe7b51e 100644 --- a/sys/arch/evbarm/conf/INTEGRATOR +++ b/sys/arch/evbarm/conf/INTEGRATOR @@ -1,4 +1,4 @@ -# $NetBSD: INTEGRATOR,v 1.64 2011/12/18 05:49:25 dholland Exp $ +# $NetBSD: INTEGRATOR,v 1.65 2012/04/06 01:47:15 bsh Exp $ # # GENERIC -- ARM Integrator board Generic kernel # @@ -155,6 +155,7 @@ ifpga0 at mainbus? # PL010 uart plcom0 at ifpga? offset 0x06000000 irq 1 plcom1 at ifpga? offset 0x07000000 irq 2 +#options PLCOM_DEBUG # PL030 real time clock plrtc0 at ifpga? offset 0x05000000 diff --git a/sys/arch/evbarm/dev/plcom.c b/sys/arch/evbarm/dev/plcom.c index ee8e3181144..2fa091f7fca 100644 --- a/sys/arch/evbarm/dev/plcom.c +++ b/sys/arch/evbarm/dev/plcom.c @@ -1,4 +1,4 @@ -/* $NetBSD: plcom.c,v 1.33 2012/02/02 19:42:59 tls Exp $ */ +/* $NetBSD: plcom.c,v 1.34 2012/04/06 01:47:16 bsh Exp $ */ /*- * Copyright (c) 2001 ARM Ltd @@ -94,7 +94,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.33 2012/02/02 19:42:59 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.34 2012/04/06 01:47:16 bsh Exp $"); #include "opt_plcom.h" #include "opt_ddb.h" @@ -280,9 +280,9 @@ plcomspeed(long speed, long frequency) #ifdef PLCOM_DEBUG int plcom_debug = 0; -void plcomstatus (struct plcom_softc *, char *); +void plcomstatus (struct plcom_softc *, const char *); void -plcomstatus(struct plcom_softc *sc, char *str) +plcomstatus(struct plcom_softc *sc, const char *str) { struct tty *tp = sc->sc_tty; @@ -304,6 +304,7 @@ plcomstatus(struct plcom_softc *sc, char *str) } #endif +/* XXX this function is not used? */ int plcomprobe1(bus_space_tag_t iot, bus_space_handle_t ioh) { -- cgit