[src/trunk]: src/sys As, siisata attaches not just at pci, but for a while no...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e7d89b09d437
branches:  trunk
changeset: 747666:e7d89b09d437
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sat Sep 26 19:01:04 2009 +0000

description:
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.

diffstat:

 sys/conf/files        |  7 ++++++-
 sys/dev/pci/files.pci |  9 +++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diffs (44 lines):

diff -r c2f53b39737d -r e7d89b09d437 sys/conf/files
--- a/sys/conf/files    Sat Sep 26 18:15:52 2009 +0000
+++ b/sys/conf/files    Sat Sep 26 19:01:04 2009 +0000
@@ -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
diff -r c2f53b39737d -r e7d89b09d437 sys/dev/pci/files.pci
--- a/sys/dev/pci/files.pci     Sat Sep 26 18:15:52 2009 +0000
+++ b/sys/dev/pci/files.pci     Sat Sep 26 19:01:04 2009 +0000
@@ -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