Mon Sep 28 00:27:13 2009 UTC ()
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.


(snj)
diff -r1.924.4.3 -r1.924.4.4 src/sys/conf/files
diff -r1.308.2.4 -r1.308.2.5 src/sys/dev/pci/files.pci
cvs diff -r1.924.4.3 -r1.924.4.4 src/sys/conf/files (expand / switch to unified diff)

--- src/sys/conf/files 2009/09/28 00:13:02 1.924.4.3
+++ src/sys/conf/files 2009/09/28 00:27:13 1.924.4.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: files,v 1.924.4.3 2009/09/28 00:13:02 snj Exp $ 1# $NetBSD: files,v 1.924.4.4 2009/09/28 00:27:13 snj Exp $
2 2
3# @(#)files.newconf 7.5 (Berkeley) 5/10/93 3# @(#)files.newconf 7.5 (Berkeley) 5/10/93
4 4
5version 20080610 5version 20080610
6 6
7# 7#
8# device classes 8# device classes
9# 9#
10devclass disk 10devclass disk
11devclass tape 11devclass tape
12devclass ifnet 12devclass ifnet
13devclass tty 13devclass tty
14devclass audiodev 14devclass audiodev
@@ -922,26 +922,31 @@ device upc { [offset = -1] } @@ -922,26 +922,31 @@ device upc { [offset = -1] }
922attach wdc at upc with wdc_upc 922attach wdc at upc with wdc_upc
923attach com at upc with com_upc 923attach com at upc with com_upc
924attach lpt at upc with lpt_upc 924attach lpt at upc with lpt_upc
925file dev/ic/upc.c upc 925file dev/ic/upc.c upc
926file dev/ic/wdc_upc.c wdc_upc 926file dev/ic/wdc_upc.c wdc_upc
927file dev/ic/com_upc.c com_upc 927file dev/ic/com_upc.c com_upc
928file dev/ic/lpt_upc.c lpt_upc 928file dev/ic/lpt_upc.c lpt_upc
929 929
930# AHCI-compatible SATA controllers 930# AHCI-compatible SATA controllers
931define ahcisata_core 931define ahcisata_core
932file dev/ic/ahcisata_core.c ahcisata_core 932file dev/ic/ahcisata_core.c ahcisata_core
933device ahcisata: ata, ata_dma, ata_udma, sata, ahcisata_core 933device ahcisata: ata, ata_dma, ata_udma, sata, ahcisata_core
934 934
 935# Silicon Image SteelVine SATA-II controllers
 936define siisata
 937file dev/ic/siisata.c siisata
 938device siisata: ata, ata_dma, ata_udma, sata, sata_fis, siisata
 939
935# DECchip 21x4x Ethernet controller family, and assorted clones. 940# DECchip 21x4x Ethernet controller family, and assorted clones.
936# 941#
937device tlp: arp, ether, ifnet, mii, mii_bitbang 942device tlp: arp, ether, ifnet, mii, mii_bitbang
938file dev/ic/tulip.c tlp 943file dev/ic/tulip.c tlp
939 944
940# Adaptec AIC-6915 Ethernet interface 945# Adaptec AIC-6915 Ethernet interface
941# 946#
942device sf: arp, ether, ifnet, mii 947device sf: arp, ether, ifnet, mii
943file dev/ic/aic6915.c sf 948file dev/ic/aic6915.c sf
944 949
945# Mostek time-of-day clock and NVRAM 950# Mostek time-of-day clock and NVRAM
946# 951#
947define mk48txx 952define mk48txx
cvs diff -r1.308.2.4 -r1.308.2.5 src/sys/dev/pci/files.pci (expand / switch to unified diff)

--- src/sys/dev/pci/files.pci 2009/09/28 00:17:28 1.308.2.4
+++ src/sys/dev/pci/files.pci 2009/09/28 00:27:13 1.308.2.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: files.pci,v 1.308.2.4 2009/09/28 00:17:28 snj Exp $ 1# $NetBSD: files.pci,v 1.308.2.5 2009/09/28 00:27:13 snj Exp $
2# 2#
3# Config file and device description for machine-independent PCI code. 3# Config file and device description for machine-independent PCI code.
4# Included by ports that need it. Requires that the SCSI files be 4# Included by ports that need it. Requires that the SCSI files be
5# defined first. 5# defined first.
6 6
7defflag opt_pci.h PCIVERBOSE PCI_CONFIG_DUMP PCI_NETBSD_CONFIGURE 7defflag opt_pci.h PCIVERBOSE PCI_CONFIG_DUMP PCI_NETBSD_CONFIGURE
8defparam opt_pci.h PCI_NETBSD_ENABLE_IDE 8defparam opt_pci.h PCI_NETBSD_ENABLE_IDE
9 9
10defflag opt_bktr.h BKTR_430_FX_MODE BKTR_GPIO_ACCESS BKTR_NO_MSP_RESET 10defflag opt_bktr.h BKTR_430_FX_MODE BKTR_GPIO_ACCESS BKTR_NO_MSP_RESET
11 BKTR_REVERSE_MUTE BKTR_SIS_VIA_MODE BKTR_USE_PLL 11 BKTR_REVERSE_MUTE BKTR_SIS_VIA_MODE BKTR_USE_PLL
12defparam opt_bktr.h BKTR_OVERRIDE_CARD BKTR_OVERRIDE_TUNER BKTR_OVERRIDE_DBX 12defparam opt_bktr.h BKTR_OVERRIDE_CARD BKTR_OVERRIDE_TUNER BKTR_OVERRIDE_DBX
13 BKTR_OVERRIDE_MSP BKTR_SYSTEM_DEFAULT 13 BKTR_OVERRIDE_MSP BKTR_SYSTEM_DEFAULT
14 14
@@ -943,31 +943,28 @@ attach age at pci @@ -943,31 +943,28 @@ attach age at pci
943file dev/pci/if_age.c age 943file dev/pci/if_age.c age
944 944
945# Attanisc/Atheros L1E Gigabit Ethernet 945# Attanisc/Atheros L1E Gigabit Ethernet
946device ale: ether, ifnet, arp, mii, mii_phy 946device ale: ether, ifnet, arp, mii, mii_phy
947attach ale at pci 947attach ale at pci
948file dev/pci/if_ale.c ale 948file dev/pci/if_ale.c ale
949 949
950# Atheros/Attansic L2 Fast-Ethernet 950# Atheros/Attansic L2 Fast-Ethernet
951device lii: ether, ifnet, arp, mii 951device lii: ether, ifnet, arp, mii
952attach lii at pci 952attach lii at pci
953file dev/pci/if_lii.c lii 953file dev/pci/if_lii.c lii
954 954
955# Silicon Image SteelVine SATA-II controllers 955# Silicon Image SteelVine SATA-II controllers
956define siisata 956attach siisata at pci with siisata_pci
957file dev/ic/siisata.c atapibus & atabus & siisata 957file dev/pci/siisata_pci.c siisata_pci
958device siisata: ata, ata_dma, ata_udma, sata, sata_fis, siisata 
959attach siisata at pci with siisata_pci 
960file dev/pci/siisata_pci.c siisata_pci 
961 958
962# Acer Labs M7101 power management controller 959# Acer Labs M7101 power management controller
963device alipm: i2cbus 960device alipm: i2cbus
964attach alipm at pci 961attach alipm at pci
965file dev/pci/alipm.c alipm 962file dev/pci/alipm.c alipm
966 963
967# 964#
968# NetOctave NSP2000 965# NetOctave NSP2000
969# 966#
970include "dev/pci/n8/files.n8" 967include "dev/pci/n8/files.n8"
971 968
972# High Definition Audio 969# High Definition Audio
973include "dev/pci/hdaudio/files.hdaudio" 970include "dev/pci/hdaudio/files.hdaudio"