[src/trunk]: src/sys/arch/amiga/dev Fix build for both amiga and amigappc (di...

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

details:   https://anonhg.NetBSD.org/src/rev/fc4ce1c49cb7
branches:  trunk
changeset: 769740:fc4ce1c49cb7
user:      rkujawa <rkujawa%NetBSD.org@localhost>
date:      Wed Sep 21 12:40:25 2011 +0000

description:
Fix build for both amiga and amigappc (discussed with christos).

diffstat:

 sys/arch/amiga/dev/zbus.c    |  7 +++----
 sys/arch/amiga/dev/zbusvar.h |  4 +++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r cf0bcebb184c -r fc4ce1c49cb7 sys/arch/amiga/dev/zbus.c
--- a/sys/arch/amiga/dev/zbus.c Wed Sep 21 12:08:02 2011 +0000
+++ b/sys/arch/amiga/dev/zbus.c Wed Sep 21 12:40:25 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zbus.c,v 1.66 2011/09/20 18:11:51 christos Exp $ */
+/*     $NetBSD: zbus.c,v 1.67 2011/09/21 12:40:25 rkujawa Exp $ */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zbus.c,v 1.66 2011/09/20 18:11:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zbus.c,v 1.67 2011/09/21 12:40:25 rkujawa Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -239,7 +239,6 @@
 int zbusprint(void *, const char *);
 int zbusmatch(device_t, cfdata_t, void *);
 static const char *aconflookup(int, int);
-static void *zbusmap(void *, u_int);
 
 /*
  * given a manufacturer id and product id, find quirks
@@ -388,7 +387,7 @@
  * Zorro devices) to have enough kva-space available, so there is no extra
  * range check done here.
  */
-static void *
+void *
 zbusmap(void *pa, u_int size)
 {
 #if defined(__m68k__)
diff -r cf0bcebb184c -r fc4ce1c49cb7 sys/arch/amiga/dev/zbusvar.h
--- a/sys/arch/amiga/dev/zbusvar.h      Wed Sep 21 12:08:02 2011 +0000
+++ b/sys/arch/amiga/dev/zbusvar.h      Wed Sep 21 12:40:25 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zbusvar.h,v 1.8 2010/02/02 19:03:31 phx Exp $  */
+/*     $NetBSD: zbusvar.h,v 1.9 2011/09/21 12:40:25 rkujawa Exp $      */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -52,6 +52,8 @@
 #define ZTWOROMTOP     (0x00F80000)
 #define NZTWOROMPG     btoc(ZTWOROMTOP-ZTWOROMBASE)
 
+void *  zbusmap(void *pa, u_int size);
+
 /*
  * maps a ztwo and/or A3000 builtin address into the mapped kva address
  */