Module Name: src
Committed By: matt
Date: Wed Apr 21 00:54:14 UTC 2010
Modified Files:
src/sys/arch/evbmips/conf [matt-nb5-mips64]: std.adm5120 std.alchemy
std.atheros std.malta std.meraki
Log Message:
sync to netbsd-5
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.62.1 src/sys/arch/evbmips/conf/std.adm5120
cvs rdiff -u -r1.3 -r1.3.88.1 src/sys/arch/evbmips/conf/std.alchemy
cvs rdiff -u -r1.3 -r1.3.72.1 src/sys/arch/evbmips/conf/std.atheros
cvs rdiff -u -r1.5.94.1 -r1.5.94.2 src/sys/arch/evbmips/conf/std.malta
cvs rdiff -u -r1.1 -r1.1.78.1 src/sys/arch/evbmips/conf/std.meraki
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/evbmips/conf/std.adm5120
diff -u src/sys/arch/evbmips/conf/std.adm5120:1.1 src/sys/arch/evbmips/conf/std.adm5120:1.1.62.1
--- src/sys/arch/evbmips/conf/std.adm5120:1.1 Tue Mar 20 08:52:01 2007
+++ src/sys/arch/evbmips/conf/std.adm5120 Wed Apr 21 00:54:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: std.adm5120,v 1.1 2007/03/20 08:52:01 dyoung Exp $
+# $NetBSD: std.adm5120,v 1.1.62.1 2010/04/21 00:54:13 matt Exp $
machine evbmips mips
include "conf/std" # MI standard options
@@ -16,3 +16,6 @@
include "arch/evbmips/conf/files.adm5120"
include "arch/mips/conf/files.adm5120"
+
+# Atheros HAL options
+include "external/isc/atheros_hal/conf/std.ath_hal"
Index: src/sys/arch/evbmips/conf/std.alchemy
diff -u src/sys/arch/evbmips/conf/std.alchemy:1.3 src/sys/arch/evbmips/conf/std.alchemy:1.3.88.1
--- src/sys/arch/evbmips/conf/std.alchemy:1.3 Tue Mar 28 03:43:57 2006
+++ src/sys/arch/evbmips/conf/std.alchemy Wed Apr 21 00:54:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: std.alchemy,v 1.3 2006/03/28 03:43:57 gdamore Exp $
+# $NetBSD: std.alchemy,v 1.3.88.1 2010/04/21 00:54:13 matt Exp $
machine evbmips mips
include "conf/std" # MI standard options
@@ -15,3 +15,6 @@
include "arch/evbmips/conf/files.alchemy"
include "arch/mips/conf/files.alchemy"
+
+# Atheros HAL options
+include "external/isc/atheros_hal/conf/std.ath_hal"
Index: src/sys/arch/evbmips/conf/std.atheros
diff -u src/sys/arch/evbmips/conf/std.atheros:1.3 src/sys/arch/evbmips/conf/std.atheros:1.3.72.1
--- src/sys/arch/evbmips/conf/std.atheros:1.3 Tue Sep 26 06:37:32 2006
+++ src/sys/arch/evbmips/conf/std.atheros Wed Apr 21 00:54:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: std.atheros,v 1.3 2006/09/26 06:37:32 gdamore Exp $
+# $NetBSD: std.atheros,v 1.3.72.1 2010/04/21 00:54:13 matt Exp $
machine evbmips mips
include "conf/std" # MI standard options
@@ -13,3 +13,6 @@
include "arch/evbmips/conf/files.atheros"
include "arch/mips/conf/files.atheros"
+
+# Atheros HAL options
+include "external/isc/atheros_hal/conf/std.ath_hal"
Index: src/sys/arch/evbmips/conf/std.malta
diff -u src/sys/arch/evbmips/conf/std.malta:1.5.94.1 src/sys/arch/evbmips/conf/std.malta:1.5.94.2
--- src/sys/arch/evbmips/conf/std.malta:1.5.94.1 Sun Aug 23 03:43:33 2009
+++ src/sys/arch/evbmips/conf/std.malta Wed Apr 21 00:54:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: std.malta,v 1.5.94.1 2009/08/23 03:43:33 matt Exp $
+# $NetBSD: std.malta,v 1.5.94.2 2010/04/21 00:54:13 matt Exp $
machine evbmips mips
include "conf/std" # MI standard options
@@ -16,3 +16,6 @@
makeoptions BOARDTYPE="malta"
include "arch/evbmips/conf/files.malta"
+
+# Atheros HAL options
+include "external/isc/atheros_hal/conf/std.ath_hal"
Index: src/sys/arch/evbmips/conf/std.meraki
diff -u src/sys/arch/evbmips/conf/std.meraki:1.1 src/sys/arch/evbmips/conf/std.meraki:1.1.78.1
--- src/sys/arch/evbmips/conf/std.meraki:1.1 Tue Sep 26 06:37:32 2006
+++ src/sys/arch/evbmips/conf/std.meraki Wed Apr 21 00:54:14 2010
@@ -1,4 +1,4 @@
-# $NetBSD: std.meraki,v 1.1 2006/09/26 06:37:32 gdamore Exp $
+# $NetBSD: std.meraki,v 1.1.78.1 2010/04/21 00:54:14 matt Exp $
machine evbmips mips
include "conf/std" # MI standard options
@@ -13,3 +13,6 @@
include "arch/evbmips/conf/files.atheros"
include "arch/mips/conf/files.atheros"
+
+# Atheros HAL options
+include "external/isc/atheros_hal/conf/std.ath_hal"
