Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-6]: src/sys/arch/x68k/x68k Pull up revision 1.28 (requested by ...



details:   https://anonhg.NetBSD.org/src/rev/929cf1c8a62a
branches:  netbsd-1-6
changeset: 528062:929cf1c8a62a
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Jun 24 04:56:33 2002 +0000

description:
Pull up revision 1.28 (requested by isaki in ticket #349):
Fix compilation error when scsibus* doesn't exist.

diffstat:

 sys/arch/x68k/x68k/autoconf.c |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (35 lines):

diff -r 0a211148b850 -r 929cf1c8a62a sys/arch/x68k/x68k/autoconf.c
--- a/sys/arch/x68k/x68k/autoconf.c     Fri Jun 21 16:30:45 2002 +0000
+++ b/sys/arch/x68k/x68k/autoconf.c     Mon Jun 24 04:56:33 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.27 2002/05/16 02:50:55 thorpej Exp $    */
+/*     $NetBSD: autoconf.c,v 1.27.2.1 2002/06/24 04:56:33 lukem Exp $  */
 
 /*
  * Copyright (c) 1995 Leo Weppelman
@@ -31,6 +31,7 @@
  */
 
 #include "opt_compat_netbsd.h"
+#include "scsibus.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -237,6 +238,7 @@
 scsi_find(bdev)
        dev_t bdev;     /* encoded boot device */
 {
+#if defined(NSCSIBUS) && NSCSIBUS > 0
        int ifid;
        char tname[16];
        struct device *scsibus;
@@ -279,6 +281,9 @@
            B_X68K_SCSI_ID(bdev), B_X68K_SCSI_LUN(bdev));
 
        return periph ? periph->periph_dev : NULL;
+#else
+       return NULL;
+#endif /* NSCSIBUS > 0 */
 }
 
 /*



Home | Main Index | Thread Index | Old Index