Module Name: src
Committed By: mbalmer
Date: Tue Aug 30 13:03:17 UTC 2011
Modified Files:
src/sys/arch/i386/conf: GENERIC
Log Message:
Attach gpio* at gpiobus? instead of at individual drivers.
To generate a diff of this commit:
cvs rdiff -u -r1.1051 -r1.1052 src/sys/arch/i386/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/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1051 src/sys/arch/i386/conf/GENERIC:1.1052
--- src/sys/arch/i386/conf/GENERIC:1.1051 Tue Aug 30 12:13:25 2011
+++ src/sys/arch/i386/conf/GENERIC Tue Aug 30 13:03:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1051 2011/08/30 12:13:25 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.1052 2011/08/30 13:03:17 mbalmer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1051 $"
+#ident "GENERIC-$Revision: 1.1052 $"
maxusers 64 # estimated number of users
@@ -441,7 +441,6 @@
# System Controllers
elansc* at mainbus? bus ? # AMD Elan SC520 System Controller
-gpio* at elansc?
# Temperatures
amdtemp* at pchb? # AMD CPU Temperature sensors
@@ -454,7 +453,7 @@
fwhrng* at ichlpcib? # Intel 82802 FWH Random Number Generator
#hpet* at ichlpcib?
gcscpcib* at pci? dev ? function ? # AMD CS5535/CS5536 PCI-ISA w/
-gpio* at gcscpcib? # timecounter, watchdog and GPIO
+ # timecounter, watchdog and GPIO
#piixpcib* at pci? dev ? function ? # Intel PIIX4 PCI-ISA w/ SpeedStep
gscpcib* at pci? dev ? function ? # NS Geode SC1100 PCI-ISA w/ GPIO
viapcib* at pci? dev ? function ? # VIA VT8235 PCI-ISA w/ SMBus support
@@ -681,7 +680,6 @@
# PC87366 hardware monitor
#nsclpcsio* at isa?
-#gpio* at nsclpcsio?
# Abit uGuru Hardware system monitor
#ug0 at isa? port 0xe0
@@ -706,8 +704,7 @@
dpti* at iop? tid 0 # DPT/Adaptec control interface
# GPIO devices
-gpio* at gscpcib?
-#gpio* at gpiosim?
+gpio* at gpiobus?
# 1-Wire support
#gpioow* at gpio? offset ? mask ? # 1-wire bitbanging via gpio
