Module Name: src
Committed By: jakllsch
Date: Sat Sep 26 19:01:04 UTC 2009
Modified Files:
src/sys/conf: files
src/sys/dev/pci: files.pci
Log Message:
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.955 -r1.956 src/sys/conf/files
cvs rdiff -u -r1.320 -r1.321 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.955 src/sys/conf/files:1.956
--- src/sys/conf/files:1.955 Wed Sep 16 15:03:56 2009
+++ src/sys/conf/files Sat Sep 26 19:01:04 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.955 2009/09/16 15:03:56 pooka Exp $
+# $NetBSD: files,v 1.956 2009/09/26 19:01:04 jakllsch Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20090313
@@ -941,6 +941,11 @@
file dev/ic/ahcisata_core.c ahcisata_core
device ahcisata: ata, ata_dma, ata_udma, sata, sata_fis, 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
+
# Mervell Serial-ATA Host Controller
define mvsata
file dev/ic/mvsata.c mvsata
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.320 src/sys/dev/pci/files.pci:1.321
--- src/sys/dev/pci/files.pci:1.320 Sun Sep 20 01:09:24 2009
+++ src/sys/dev/pci/files.pci Sat Sep 26 19:01:04 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.320 2009/09/20 01:09:24 christos Exp $
+# $NetBSD: files.pci,v 1.321 2009/09/26 19:01:04 jakllsch Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -957,11 +957,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
