Module Name: src
Committed By: msaitoh
Date: Fri Dec 19 17:06:31 UTC 2014
Modified Files:
src/sys/arch/amd64/conf: GENERIC
Log Message:
Sync gpio related lines with i386/conf/GENERIC.
To generate a diff of this commit:
cvs rdiff -u -r1.405 -r1.406 src/sys/arch/amd64/conf/GENERIC
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/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.405 src/sys/arch/amd64/conf/GENERIC:1.406
--- src/sys/arch/amd64/conf/GENERIC:1.405 Fri Dec 12 01:13:40 2014
+++ src/sys/arch/amd64/conf/GENERIC Fri Dec 19 17:06:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.405 2014/12/12 01:13:40 christos Exp $
+# $NetBSD: GENERIC,v 1.406 2014/12/19 17:06:31 msaitoh Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.405 $"
+#ident "GENERIC-$Revision: 1.406 $"
maxusers 64 # estimated number of users
@@ -537,14 +537,12 @@ ld* at iop? tid ? # block devices
#dpti* at iop? tid 0 # DPT/Adaptec control interface
# GPIO devices
-#gpio* at gpiobus?
-#gpioow* at gpio?
-#onewire* at gpioow?
+gpio* at gpiobus?
# 1- Wire support
#gpioow* at gpio? offset ? mask ? # 1-wire bitbanging via gpio
-#gpioow* at gpio?
-#onewire* at gpioow?
+gpioow* at gpio?
+onewire* at gpioow?
# I2C support
#gpioiic* at gpio?
