[src/trunk]: src/sys/arch/macppc/macppc Catch up with 1.5 branch... Allow nv...

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

details:   https://anonhg.NetBSD.org/src/rev/8caae217535a
branches:  trunk
changeset: 526228:8caae217535a
user:      briggs <briggs%NetBSD.org@localhost>
date:      Sun Apr 28 17:55:47 2002 +0000

description:
Catch up with 1.5 branch...  Allow nvram device to be omitted from kernel
configuration.  Fix noted by Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost> and
problme noticed by Louis Guillaume <lguillaume%berklee.edu@localhost>.

diffstat:

 sys/arch/macppc/macppc/conf.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 48d7c849b03c -r 8caae217535a sys/arch/macppc/macppc/conf.c
--- a/sys/arch/macppc/macppc/conf.c     Sun Apr 28 17:44:43 2002 +0000
+++ b/sys/arch/macppc/macppc/conf.c     Sun Apr 28 17:55:47 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: conf.c,v 1.38 2002/03/16 16:55:56 martin Exp $ */
+/*     $NetBSD: conf.c,v 1.39 2002/04/28 17:55:47 briggs Exp $ */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -125,6 +125,7 @@
 cdev_decl(aed);
 cdev_decl(wd);
 cdev_decl(ofc);
+#include "nvram.h"
 cdev_decl(nvram);
 #include "cz.h"
 cdev_decl(cztty);
@@ -213,7 +214,7 @@
        cdev_disk_init(NWD,wd),         /* 30: IDE disk driver */
        cdev_lkm_init(NLKM,lkm),        /* 31: loadable module driver */
        cdev_fd_init(1,filedesc),       /* 32: file descriptor pseudo-device */
-       cdev_mm_init(1,nvram),          /* 33: nvram device */
+       cdev_mm_init(NNVRAM,nvram),     /* 33: nvram device */
        cdev_scsibus_init(NSCSIBUS,scsibus), /* 34: SCSI bus */
        cdev_wsdisplay_init(NWSDISPLAY,wsdisplay), /* 35: wsdisplay */
        cdev_mouse_init(NWSKBD,wskbd),  /* 36: wskbd */