From 99f66b5ee8febd41a34d320c052ed153fb37040a Mon Sep 17 00:00:00 2001 From: msaitoh Date: Fri, 19 Dec 2014 17:06:31 +0000 Subject: [PATCH] Sync gpio related lines with i386/conf/GENERIC. --- sys/arch/amd64/conf/GENERIC | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index aed746e3571c..ec25e05120c4 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -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?