[src/trunk]: src/sys/arch/sparc/dev Wrap sbuserr_handler and sbus_error with:

[jdc <jdc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/eb6f44a2edda
branches:  trunk
changeset: 781704:eb6f44a2edda
user:      jdc <jdc%NetBSD.org@localhost>
date:      Sun Sep 23 09:54:04 2012 +0000

description:
Wrap sbuserr_handler and sbus_error with:
  #if (defined(SUN4M) && !defined(MSIIEP)) || defined(SUN4D)
to give them the same scope as the definitions in ../sparc/intr.c.
Allows SUN4C-only kernels to compile.
OK mrg

diffstat:

 sys/arch/sparc/dev/sbus.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (52 lines):

diff -r c692f138b183 -r eb6f44a2edda sys/arch/sparc/dev/sbus.c
--- a/sys/arch/sparc/dev/sbus.c Sun Sep 23 06:05:32 2012 +0000
+++ b/sys/arch/sparc/dev/sbus.c Sun Sep 23 09:54:04 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sbus.c,v 1.77 2012/07/29 00:04:05 matt Exp $ */
+/*     $NetBSD: sbus.c,v 1.78 2012/09/23 09:54:04 jdc Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.77 2012/07/29 00:04:05 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.78 2012/09/23 09:54:04 jdc Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -113,8 +113,10 @@
 void   sbus_attach_iommu(device_t, device_t, void *);
 void   sbus_attach_xbox(device_t, device_t, void *);
 
+#if (defined(SUN4M) && !defined(MSIIEP)) || defined(SUN4D)
 static int sbus_error(void);
 extern int (*sbuserr_handler)(void);
+#endif
 
 CFATTACH_DECL_NEW(sbus_mainbus, sizeof(struct sbus_softc),
     sbus_match_mainbus, sbus_attach_mainbus, NULL, NULL);
@@ -311,7 +313,9 @@
        printf(": clock = %s MHz\n", clockfreq(sc->sc_clockfreq));
 
        sbus_sc = sc;
+#if (defined(SUN4M) && !defined(MSIIEP)) || defined(SUN4D)
        sbuserr_handler = sbus_error;
+#endif
        sbus_attach_common(sc, "sbus", node, NULL);
 }
 
@@ -594,6 +598,7 @@
        return (ih);
 }
 
+#if (defined(SUN4M) && !defined(MSIIEP)) || defined(SUN4D)
 static int
 sbus_error(void)
 {
@@ -625,3 +630,4 @@
 
        return (0);
 }
+#endif