Added scsi_scan_wait module to modules_load for 2.6.20 support. Thanks to Robin...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@478 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index 26a15d4e47c782c3e989af8d65f036ba9dceeaa9..8de05dc6bb4f338131553bc93590affbdc2f134f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for genkernel
-# Copyright 2006-2006 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org> alpha/modules_load,
+  x86/modules_load, x86_64/modules_load, xen0/modules_load,
+  xenU/modules_load:
+  Added scsi_scan_wait module to modules_load for 2.6.20 support. Thanks to
+  Robin H. Johnson for <robbat2@gentoo.org> for pointing it out.
+
   27 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_bootloader.sh,
   generic/initrd.scripts:
   Added a case statement for the keymap selection to ensure we're always using

diff --git a/alpha/modules_load b/alpha/modules_load
index dad54583805301ccc301db911e3a4fec0c56e1a6..dd25bead07d66bce99efd6475af1cf410adccf6b 100644 (file)
--- a/alpha/modules_load
+++ b/alpha/modules_load
@@ -9,7 +9,7 @@ NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 \
 sim710 sym53c416 dc395x atp870u mptbase mptscsih \
 mptspi mptfc 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \
 sx8 aacraid megaraid_mbox megaraid_mm megaraid_sas \
-lpfc scsi_transport_fc"
+lpfc scsi_transport_fc scsi_wait_scan"
 
 MODULES_NET="e1000 tg3"
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
@@ -22,7 +22,4 @@ MODULES_LVM2="dm-mod dm-snapshot dm-mirror dm-bbr"
 MODULES_EVMS2="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 \
 raid456 raid5 raid6 raid10"
 MODULES_DMRAID="dm-mod dm-mirror raid0 raid1 raid10"
-MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via \
-sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci \
-ata_piix sata_mv pdc_adma"
 MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"

diff --git a/x86/modules_load b/x86/modules_load
index dad54583805301ccc301db911e3a4fec0c56e1a6..026d392a2c1f17611fdfc59b27de76bbe649ea92 100644 (file)
--- a/x86/modules_load
+++ b/x86/modules_load
@@ -9,7 +9,7 @@ NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 \
 sim710 sym53c416 dc395x atp870u mptbase mptscsih \
 mptspi mptfc 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \
 sx8 aacraid megaraid_mbox megaraid_mm megaraid_sas \
-lpfc scsi_transport_fc"
+lpfc scsi_transport_fc scsi_wait_scan"
 
 MODULES_NET="e1000 tg3"
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
@@ -24,5 +24,5 @@ raid456 raid5 raid6 raid10"
 MODULES_DMRAID="dm-mod dm-mirror raid0 raid1 raid10"
 MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via \
 sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci \
-ata_piix sata_mv pdc_adma"
+ata_piix sata_mv pdc_adma scsi_wait_scan"
 MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"

diff --git a/x86_64/modules_load b/x86_64/modules_load
index dad54583805301ccc301db911e3a4fec0c56e1a6..026d392a2c1f17611fdfc59b27de76bbe649ea92 100644 (file)
--- a/x86_64/modules_load
+++ b/x86_64/modules_load
@@ -9,7 +9,7 @@ NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 \
 sim710 sym53c416 dc395x atp870u mptbase mptscsih \
 mptspi mptfc 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \
 sx8 aacraid megaraid_mbox megaraid_mm megaraid_sas \
-lpfc scsi_transport_fc"
+lpfc scsi_transport_fc scsi_wait_scan"
 
 MODULES_NET="e1000 tg3"
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
@@ -24,5 +24,5 @@ raid456 raid5 raid6 raid10"
 MODULES_DMRAID="dm-mod dm-mirror raid0 raid1 raid10"
 MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via \
 sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci \
-ata_piix sata_mv pdc_adma"
+ata_piix sata_mv pdc_adma scsi_wait_scan"
 MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"

diff --git a/xen0/modules_load b/xen0/modules_load
index 719c0c8defff39f3cea5fa372c24f5482889cdfd..026d392a2c1f17611fdfc59b27de76bbe649ea92 100644 (file)
--- a/xen0/modules_load
+++ b/xen0/modules_load
@@ -8,8 +8,10 @@ seagate t128 u14-34f ultrastor wd7000  \
 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 \
 sim710 sym53c416 dc395x atp870u mptbase mptscsih \
 mptspi mptfc 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \
-sx8 aacraid megaraid_mbox megaraid_mm megaraid_sas "
+sx8 aacraid megaraid_mbox megaraid_mm megaraid_sas \
+lpfc scsi_transport_fc scsi_wait_scan"
 
+MODULES_NET="e1000 tg3"
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_PCMCIA="pcmcia_core yenta_socket i82365 \
@@ -18,9 +20,9 @@ MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd \
 ohci-hcd usbhid sl811-hcd"
 MODULES_LVM2="dm-mod dm-snapshot dm-mirror dm-bbr"
 MODULES_EVMS2="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 \
-raid5 raid6 raid10"
-MODULES_DMRAID="dm-mod dm-mirror"
+raid456 raid5 raid6 raid10"
+MODULES_DMRAID="dm-mod dm-mirror raid0 raid1 raid10"
 MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via \
 sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci \
-ata_piix sata_mv pdc_adma"
+ata_piix sata_mv pdc_adma scsi_wait_scan"
 MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"

diff --git a/xenU/modules_load b/xenU/modules_load
index 719c0c8defff39f3cea5fa372c24f5482889cdfd..026d392a2c1f17611fdfc59b27de76bbe649ea92 100644 (file)
--- a/xenU/modules_load
+++ b/xenU/modules_load
@@ -8,8 +8,10 @@ seagate t128 u14-34f ultrastor wd7000  \
 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 \
 sim710 sym53c416 dc395x atp870u mptbase mptscsih \
 mptspi mptfc 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \
-sx8 aacraid megaraid_mbox megaraid_mm megaraid_sas "
+sx8 aacraid megaraid_mbox megaraid_mm megaraid_sas \
+lpfc scsi_transport_fc scsi_wait_scan"
 
+MODULES_NET="e1000 tg3"
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_PCMCIA="pcmcia_core yenta_socket i82365 \
@@ -18,9 +20,9 @@ MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd \
 ohci-hcd usbhid sl811-hcd"
 MODULES_LVM2="dm-mod dm-snapshot dm-mirror dm-bbr"
 MODULES_EVMS2="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 \
-raid5 raid6 raid10"
-MODULES_DMRAID="dm-mod dm-mirror"
+raid456 raid5 raid6 raid10"
+MODULES_DMRAID="dm-mod dm-mirror raid0 raid1 raid10"
 MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via \
 sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci \
-ata_piix sata_mv pdc_adma"
+ata_piix sata_mv pdc_adma scsi_wait_scan"
 MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"