diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2007-08-04 14:37:35 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2007-08-04 14:37:35 +0000 |
| commit | 97fcc3b83be1e3871c314abe7dedfca906b14431 (patch) | |
| tree | 4b94fcc298e09abfa9b2e4201e6070b491d4896f /sys | |
| parent | 569566e588e838b1c495a2fe7ccdd5331639ab45 (diff) | |
Since ahc_controller_info()'s definition is inside #ifndef DEBUG, put
it's declaration and only use inside #ifndef DEBUG too. Lets DEBUG
kernel compile again. Non-DEBUG kernel still compiles too.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/aic7xxx_openbsd.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/aic7xxxvar.h | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/dev/ic/aic7xxx_openbsd.c b/sys/dev/ic/aic7xxx_openbsd.c index 11b69aa5305..1d1a19ea376 100644 --- a/sys/dev/ic/aic7xxx_openbsd.c +++ b/sys/dev/ic/aic7xxx_openbsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxx_openbsd.c,v 1.34 2007/05/02 02:20:37 krw Exp $ */ +/* $OpenBSD: aic7xxx_openbsd.c,v 1.35 2007/08/04 14:37:34 krw Exp $ */ /* $NetBSD: aic7xxx_osm.c,v 1.14 2003/11/02 11:07:44 wiz Exp $ */ /* @@ -88,7 +88,6 @@ int ahc_attach(struct ahc_softc *ahc) { struct scsibus_attach_args saa; - char ahc_info[256]; int s; s = splbio(); @@ -110,10 +109,13 @@ ahc_attach(struct ahc_softc *ahc) ahc->sc_channel_b.adapter_target = ahc->our_id_b; } +#ifndef DEBUG if (bootverbose) { + char ahc_info[256]; ahc_controller_info(ahc, ahc_info, sizeof ahc_info); printf("%s: %s\n", ahc->sc_dev.dv_xname, ahc_info); } +#endif ahc_intr_enable(ahc, TRUE); diff --git a/sys/dev/ic/aic7xxxvar.h b/sys/dev/ic/aic7xxxvar.h index c7947436f34..a1275bc2432 100644 --- a/sys/dev/ic/aic7xxxvar.h +++ b/sys/dev/ic/aic7xxxvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxxvar.h,v 1.23 2007/05/14 01:37:49 deraadt Exp $ */ +/* $OpenBSD: aic7xxxvar.h,v 1.24 2007/08/04 14:37:34 krw Exp $ */ /* * Core definitions and data structures shareable across OS platforms. * @@ -38,7 +38,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: aic7xxxvar.h,v 1.23 2007/05/14 01:37:49 deraadt Exp $ + * $Id: aic7xxxvar.h,v 1.24 2007/08/04 14:37:34 krw Exp $ * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.50 2003/12/17 00:02:09 gibbs Exp $ */ @@ -1222,7 +1222,9 @@ int ahc_match_scb(struct ahc_softc *ahc, struct scb *scb, /****************************** Initialization ********************************/ int ahc_softc_init(struct ahc_softc *); +#ifndef DEBUG void ahc_controller_info(struct ahc_softc *, char *, size_t); +#endif int ahc_chip_init(struct ahc_softc *ahc); int ahc_init(struct ahc_softc *ahc); void ahc_intr_enable(struct ahc_softc *ahc, int enable); |