Module Name:    src
Committed By:   tsutsui
Date:           Sat Jul  5 09:47:30 UTC 2014

Modified Files:
        src/sys/arch/amiga/conf: GENERIC.in

Log Message:
Disable X-Surf devices for DRACO's configuration.

- ne at xsh requires ax88190 and ax88190 requires mii(4),
  but all mii devices are declared only inside AMIGA_CONFIGURATION
- X-Surf also add wdc(4) but all children devices like atabus and
  atapibus are declared only for AMIGA_CONFIGURATION

XXX: DRACO kernel is not built during build.sh release.


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/sys/arch/amiga/conf/GENERIC.in

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.123 src/sys/arch/amiga/conf/GENERIC.in:1.124
--- src/sys/arch/amiga/conf/GENERIC.in:1.123	Thu Dec 26 20:38:11 2013
+++ src/sys/arch/amiga/conf/GENERIC.in	Sat Jul  5 09:47:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.123 2013/12/26 20:38:11 rkujawa Exp $
+# $NetBSD: GENERIC.in,v 1.124 2014/07/05 09:47:30 tsutsui 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.123 $"
+#ident 		"GENERIC-$Revision: 1.124 $"
 
 m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
 makeoptions	COPTS="-Os"
@@ -455,6 +455,7 @@ ed*		at zbus0		# Hydra, ASDG LanRover
 es*		at zbus0		# CEI A4066 EthernetPLUS
 qn*		at zbus0		# Quicknet
 
+m4_ifdef(`AMIGA_CONFIGURATION', `m4_dnl
 xsh*		at zbus0		# X-Surf 100
 ne*		at xshbus?		# NE2000 chip on X-Surf 100
 
@@ -464,6 +465,7 @@ gencp*		at xsurfbus?		# clockports on X-
 wdc*		at xsurfbus?		# IDE on X-Surf
 
 clockport*	at gencp?
+')m4_dnl
 
 # Arcnet
 bah*		at zbus0		# C=/Ameristar A2060 / 560

Reply via email to