Module Name: src
Committed By: macallan
Date: Fri Dec 10 00:31:27 UTC 2010
Modified Files:
src/sys/arch/macppc/conf: GENERIC
Log Message:
fix some typos, new ADB is no longer experimental
while there add some (S)ATA drivers from i386 which might be found on PCI cards
To generate a diff of this commit:
cvs rdiff -u -r1.283 -r1.284 src/sys/arch/macppc/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/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.283 src/sys/arch/macppc/conf/GENERIC:1.284
--- src/sys/arch/macppc/conf/GENERIC:1.283 Tue Nov 23 11:14:01 2010
+++ src/sys/arch/macppc/conf/GENERIC Fri Dec 10 00:31:26 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.283 2010/11/23 11:14:01 hannken Exp $
+# $NetBSD: GENERIC,v 1.284 2010/12/10 00:31:26 macallan Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.283 $"
+#ident "GENERIC-$Revision: 1.284 $"
maxusers 32
@@ -303,16 +303,19 @@
pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver
acardide* at pci? dev ? function ? # Acard IDE controllers
aceride* at pci? dev ? function ? # Acer Lab IDE controllers
+ahcisata* at pci? dev ? function ? # AHCI SATA controllers
artsata* at pci? dev ? function ? # Intel i31244 SATA controller
cmdide* at pci? dev ? function ? # CMD tech IDE controllers
cypide* at pci? dev ? function ? # Cypress IDE controllers
hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers
+iteide* at pci? dev ? function ? # IT Express IDE controllers
optiide* at pci? dev ? function ? # Opti IDE controllers
pdcide* at pci? dev ? function ? # Promise IDE controllers
pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
satalink* at pci? dev ? function ? # SiI SATALink controllers
siside* at pci? dev ? function ? # SiS IDE controllers
slide* at pci? dev ? function ? # Symphony Labs IDE controllers
+stpcide* at pci? dev ? function ? # STMicro STPC IDE controllers
viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers
wdc* at pci? dev ? function ? # Kauai ATA
cbb* at pci? dev ? function ? # PCI-CardBus bridge
@@ -368,7 +371,7 @@
#ams* at adb? # ADB mouse
#abtn* at adb?
-# the new, improved, experimental ADB subsystem
+# the new, improved ADB subsystem
cuda* at obio? # CUDA, for Old World PowerMacs
pmu* at obio? # PMU, *Books and newer PowerMacs
@@ -381,7 +384,7 @@
wsmouse* at wsmousedev?
battery* at pmu? # legacy battery, for ohare-based PowerBooks
-smartbat* at pmu? # Smart battery, sound in newer *Books
+smartbat* at pmu? # Smart battery, found in newer *Books
iic0 at cuda0 # CUDA's IIC bus
sgsmix0 at iic0 addr 0x8a # additional mixer found in beige G3
