Module Name: src
Committed By: snj
Date: Mon Sep 28 00:27:13 UTC 2009
Modified Files:
src/sys/conf [netbsd-5]: files
src/sys/dev/pci [netbsd-5]: files.pci
Log Message:
Pull up following revision(s) (requested by jakllsch in ticket #1023):
sys/conf/files: revision 1.956 via patch
sys/dev/pci/files.pci: revision 1.321
As, siisata attaches not just at pci, but for a while now, also at cardbus,
move siisata core driver config to the propper config file.
To generate a diff of this commit:
cvs rdiff -u -r1.924.4.3 -r1.924.4.4 src/sys/conf/files
cvs rdiff -u -r1.308.2.4 -r1.308.2.5 src/sys/dev/pci/files.pci
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.924.4.3 src/sys/conf/files:1.924.4.4
--- src/sys/conf/files:1.924.4.3 Mon Sep 28 00:13:02 2009
+++ src/sys/conf/files Mon Sep 28 00:27:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.924.4.3 2009/09/28 00:13:02 snj Exp $
+# $NetBSD: files,v 1.924.4.4 2009/09/28 00:27:13 snj Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -932,6 +932,11 @@
file dev/ic/ahcisata_core.c ahcisata_core
device ahcisata: ata, ata_dma, ata_udma, sata, ahcisata_core
+# Silicon Image SteelVine SATA-II controllers
+define siisata
+file dev/ic/siisata.c siisata
+device siisata: ata, ata_dma, ata_udma, sata, sata_fis, siisata
+
# DECchip 21x4x Ethernet controller family, and assorted clones.
#
device tlp: arp, ether, ifnet, mii, mii_bitbang
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.308.2.4 src/sys/dev/pci/files.pci:1.308.2.5
--- src/sys/dev/pci/files.pci:1.308.2.4 Mon Sep 28 00:17:28 2009
+++ src/sys/dev/pci/files.pci Mon Sep 28 00:27:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.308.2.4 2009/09/28 00:17:28 snj Exp $
+# $NetBSD: files.pci,v 1.308.2.5 2009/09/28 00:27:13 snj Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -953,11 +953,8 @@
file dev/pci/if_lii.c lii
# Silicon Image SteelVine SATA-II controllers
-define siisata
-file dev/ic/siisata.c atapibus & atabus & siisata
-device siisata: ata, ata_dma, ata_udma, sata, sata_fis, siisata
-attach siisata at pci with siisata_pci
-file dev/pci/siisata_pci.c siisata_pci
+attach siisata at pci with siisata_pci
+file dev/pci/siisata_pci.c siisata_pci
# Acer Labs M7101 power management controller
device alipm: i2cbus
