Module Name: src
Committed By: rkujawa
Date: Mon Jan 28 14:54:51 UTC 2013
Modified Files:
src/sys/arch/amiga/conf: GENERIC.in files.amiga
Log Message:
Add empm(4) driver to config files.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.167 -r1.168 src/sys/arch/amiga/conf/files.amiga
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/conf/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.107 src/sys/arch/amiga/conf/GENERIC.in:1.108
--- src/sys/arch/amiga/conf/GENERIC.in:1.107 Sun Nov 25 23:37:10 2012
+++ src/sys/arch/amiga/conf/GENERIC.in Mon Jan 28 14:54:51 2013
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.107 2012/11/25 23:37:10 rkujawa Exp $
+# $NetBSD: GENERIC.in,v 1.108 2013/01/28 14:54:51 rkujawa Exp $
#
##
# GENERIC machine description file
@@ -52,7 +52,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.107 $"
+#ident "GENERIC-$Revision: 1.108 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os"
@@ -585,6 +585,7 @@ pci* at mppb?
empb0 at zbus0 # ELBOX Mediator PCI 1200
emmem0 at zbus0 # ELBOX Mediator PCI memory space
+empm0 at empb0 # ELBOX Mediator PCI Power Management
pci* at empb0
#cv3dpb* at zbus0 # CyberVision 64/3D PCI bridge
Index: src/sys/arch/amiga/conf/files.amiga
diff -u src/sys/arch/amiga/conf/files.amiga:1.167 src/sys/arch/amiga/conf/files.amiga:1.168
--- src/sys/arch/amiga/conf/files.amiga:1.167 Fri Jan 11 11:00:33 2013
+++ src/sys/arch/amiga/conf/files.amiga Mon Jan 28 14:54:51 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files.amiga,v 1.167 2013/01/11 11:00:33 he Exp $
+# $NetBSD: files.amiga,v 1.168 2013/01/28 14:54:51 rkujawa Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -543,9 +543,14 @@ device cv3dpb: pcibus
attach cv3dpb at zbus
file arch/amiga/pci/cv3dpb.c cv3dpb & pci
-device empb: pcibus, amibus_empb
+define empmdev { }
+device empm
+attach empm at empmdev
+file arch/amiga/pci/empm.c empm needs-flag
+
+device empb: pcibus, amibus_empb, empmdev
attach empb at zbus
-file arch/amiga/pci/empb.c empb & pci
+file arch/amiga/pci/empb.c empb & pci & empm
device emmem {}
attach emmem at zbus
