Clean up the modules_load files and add qla2xxx. This is genkernel 3.4.10_pre6 for testing.

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

14 files changed, 177 insertions, 202 deletions

diff --git a/ChangeLog b/ChangeLog
index 6419976..f964b21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> alpha/modules_load,
+  genkernel, ia64/modules_load, mips/modules_load, parisc/modules_load,
+  parisc64/modules_load, ppc/modules_load, ppc64/modules_load,
+  sparc/modules_load, sparc64/modules_load, um/modules_load,
+  x86/modules_load, x86_64/modules_load:
+  Clean up the modules_load files and add qla2xxx. This is genkernel
+  3.4.10_pre6 for testing.
+
   13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
   Stick CONFIG_INITRAMFS_ROOT_GID in the .config, too
 
diff --git a/alpha/modules_load b/alpha/modules_load
index 0054a39..b0f611e 100644
--- a/alpha/modules_load
+++ b/alpha/modules_load
@@ -3,40 +3,22 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 \
-raid5 raid6 raid10"
+MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 \
-raid5 raid6 raid10"
+MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 
 # Hardware (IDE/SCSI/SATA)
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 \
-pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_optidma \
-pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform \
-pata_serverworks pata_legacy pata_ns87410 pata_pcmcia pata_isapnp pata_ali \
-pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 \
-pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron \
-pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105"
-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 libata \
-ata_piix sata_mv pdc_adma scsi_wait_scan"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic \
-ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x \
-dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp \
-seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm \
-in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih \
-mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid \
-megaraid megaraid_mbox megaraid_mm megaraid_sas lpfc scsi_transport_fc scsi_wait_scan"
+MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_pcmcia pata_isapnp pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 scsi_wait_scan"
+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 libata ata_piix sata_mv pdc_adma scsi_wait_scan"
+MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc scsi_wait_scan"
 
 # Hardware (Network)
 MODULES_NET="e1000 tg3"
 
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia_core yenta_socket i82365 \
-ds ide-cs firmware_class"
-MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd \
-ohci-hcd usbhid sl811-hcd"
+MODULES_PCMCIA="pcmcia_core yenta_socket i82365 ds ide-cs firmware_class"
+MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 
 # Filesystems
 MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
diff --git a/genkernel b/genkernel
index 328011a..1c1119c 100755
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.10_pre5'
+GK_V='3.4.10_pre6'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.
diff --git a/ia64/modules_load b/ia64/modules_load
index 0054a39..b0f611e 100644
--- a/ia64/modules_load
+++ b/ia64/modules_load
@@ -3,40 +3,22 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 \
-raid5 raid6 raid10"
+MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 \
-raid5 raid6 raid10"
+MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 
 # Hardware (IDE/SCSI/SATA)
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 \
-pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_optidma \
-pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform \
-pata_serverworks pata_legacy pata_ns87410 pata_pcmcia pata_isapnp pata_ali \
-pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 \
-pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron \
-pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105"
-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 libata \
-ata_piix sata_mv pdc_adma scsi_wait_scan"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic \
-ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x \
-dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp \
-seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm \
-in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih \
-mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid \
-megaraid megaraid_mbox megaraid_mm megaraid_sas lpfc scsi_transport_fc scsi_wait_scan"
+MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_pcmcia pata_isapnp pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 scsi_wait_scan"
+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 libata ata_piix sata_mv pdc_adma scsi_wait_scan"
+MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc scsi_wait_scan"
 
 # Hardware (Network)
 MODULES_NET="e1000 tg3"
 
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia_core yenta_socket i82365 \
-ds ide-cs firmware_class"
-MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd \
-ohci-hcd usbhid sl811-hcd"
+MODULES_PCMCIA="pcmcia_core yenta_socket i82365 ds ide-cs firmware_class"
+MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 
 # Filesystems
 MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
diff --git a/mips/modules_load b/mips/modules_load
index 5c42da8..b0f611e 100644
--- a/mips/modules_load
+++ b/mips/modules_load
@@ -1,5 +1,24 @@
-MODULES_SCSI=""
-MODULES_FIREWIRE=""
-MODULES_ATARAID=""
-MODULES_PCMCIA=""
-MODULES_USB=""
+# Module groups for genkernel initrd/initramfs auto-loading
+
+# RAID
+MODULES_ATARAID="ataraid pdcraid hptraid"
+MODULES_DMRAID="dm-mod dm-mirror"
+MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
+MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
+MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
+
+# Hardware (IDE/SCSI/SATA)
+MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_pcmcia pata_isapnp pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 scsi_wait_scan"
+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 libata ata_piix sata_mv pdc_adma scsi_wait_scan"
+MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc scsi_wait_scan"
+
+# Hardware (Network)
+MODULES_NET="e1000 tg3"
+
+# Hardware (Pluggable)
+MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
+MODULES_PCMCIA="pcmcia_core yenta_socket i82365 ds ide-cs firmware_class"
+MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
+
+# Filesystems
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
diff --git a/parisc/modules_load b/parisc/modules_load
index b91177c..b0f611e 100644
--- a/parisc/modules_load
+++ b/parisc/modules_load
@@ -1,5 +1,24 @@
-MODULES_SCSI=""
-MODULES_FIREWIRE=""
-MODULES_ATARAID=""
-MODULES_PCMCIA=""
-MODULES_USB="usb-ohci hid usb-storage"
+# Module groups for genkernel initrd/initramfs auto-loading
+
+# RAID
+MODULES_ATARAID="ataraid pdcraid hptraid"
+MODULES_DMRAID="dm-mod dm-mirror"
+MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
+MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
+MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
+
+# Hardware (IDE/SCSI/SATA)
+MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_pcmcia pata_isapnp pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 scsi_wait_scan"
+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 libata ata_piix sata_mv pdc_adma scsi_wait_scan"
+MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc scsi_wait_scan"
+
+# Hardware (Network)
+MODULES_NET="e1000 tg3"
+
+# Hardware (Pluggable)
+MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
+MODULES_PCMCIA="pcmcia_core yenta_socket i82365 ds ide-cs firmware_class"
+MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
+
+# Filesystems
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
diff --git a/parisc64/modules_load b/parisc64/modules_load
index fe65a36..b0f611e 100644
--- a/parisc64/modules_load
+++ b/parisc64/modules_load
@@ -1,7 +1,24 @@
-MODULES_SCSI=""
-MODULES_FS=""
-MODULES_FIREWIRE=""
-MODULES_ATARAID=""
-MODULES_PCMCIA=""
-MODULES_USB="usb-ohci hid usb-storage"
+# Module groups for genkernel initrd/initramfs auto-loading
 
+# RAID
+MODULES_ATARAID="ataraid pdcraid hptraid"
+MODULES_DMRAID="dm-mod dm-mirror"
+MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
+MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
+MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
+
+# Hardware (IDE/SCSI/SATA)
+MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_pcmcia pata_isapnp pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 scsi_wait_scan"
+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 libata ata_piix sata_mv pdc_adma scsi_wait_scan"
+MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc scsi_wait_scan"
+
+# Hardware (Network)
+MODULES_NET="e1000 tg3"
+
+# Hardware (Pluggable)
+MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
+MODULES_PCMCIA="pcmcia_core yenta_socket i82365 ds ide-cs firmware_class"
+MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
+
+# Filesystems
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
diff --git a/ppc/modules_load b/ppc/modules_load
index 0054a39..b0f611e 100644
--- a/ppc/modules_load
+++ b/ppc/modules_load
@@ -3,40 +3,22 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 \
-raid5 raid6 raid10"
+MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 \
-raid5 raid6 raid10"
+MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 
 # Hardware (IDE/SCSI/SATA)
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 \
-pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_optidma \
-pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform \
-pata_serverworks pata_legacy pata_ns87410 pata_pcmcia pata_isapnp pata_ali \
-pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 \
-pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron \
-pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105"
-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 libata \
-ata_piix sata_mv pdc_adma scsi_wait_scan"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic \
-ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x \
-dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp \
-seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm \
-in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih \
-mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid \
-megaraid megaraid_mbox megaraid_mm megaraid_sas lpfc scsi_transport_fc scsi_wait_scan"
+MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_pcmcia pata_isapnp pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 scsi_wait_scan"
+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 libata ata_piix sata_mv pdc_adma scsi_wait_scan"
+MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc scsi_wait_scan"
 
 # Hardware (Network)
 MODULES_NET="e1000 tg3"
 
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia_core yenta_socket i82365 \
-ds ide-cs firmware_class"
-MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd \
-ohci-hcd usbhid sl811-hcd"
+MODULES_PCMCIA="pcmcia_core yenta_socket i82365 ds ide-cs firmware_class"
+MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 
 # Filesystems
 MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
diff --git a/ppc64/modules_load b/ppc64/modules_load
index 0054a39..b0f611e 100644
--- a/ppc64/modules_load
+++ b/ppc64/modules_load
@@ -3,40 +3,22 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 \
-raid5 raid6 raid10"
+MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 \
-raid5 raid6 raid10"
+MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 
 # Hardware (IDE/SCSI/SATA)
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 \
-pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_optidma \
-pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform \
-pata_serverworks pata_legacy pata_ns87410 pata_pcmcia pata_isapnp pata_ali \
-pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 \
-pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron \
-pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105"
-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 libata \
-ata_piix sata_mv pdc_adma scsi_wait_scan"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic \
-ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x \
-dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp \
-seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm \
-in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih \
-mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid \
-megaraid megaraid_mbox megaraid_mm megaraid_sas lpfc scsi_transport_fc scsi_wait_scan"
+MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_pcmcia pata_isapnp pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 scsi_wait_scan"
+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 libata ata_piix sata_mv pdc_adma scsi_wait_scan"
+MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc scsi_wait_scan"
 
 # Hardware (Network)
 MODULES_NET="e1000 tg3"
 
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia_core yenta_socket i82365 \
-ds ide-cs firmware_class"
-MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd \
-ohci-hcd usbhid sl811-hcd"
+MODULES_PCMCIA="pcmcia_core yenta_socket i82365 ds ide-cs firmware_class"
+MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 
 # Filesystems
 MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
diff --git a/sparc/modules_load b/sparc/modules_load
index 5c42da8..b0f611e 100644
--- a/sparc/modules_load
+++ b/sparc/modules_load
@@ -1,5 +1,24 @@
-MODULES_SCSI=""
-MODULES_FIREWIRE=""
-MODULES_ATARAID=""
-MODULES_PCMCIA=""
-MODULES_USB=""
+# Module groups for genkernel initrd/initramfs auto-loading
+
+# RAID
+MODULES_ATARAID="ataraid pdcraid hptraid"
+MODULES_DMRAID="dm-mod dm-mirror"
+MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
+MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
+MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
+
+# Hardware (IDE/SCSI/SATA)
+MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_pcmcia pata_isapnp pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 scsi_wait_scan"
+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 libata ata_piix sata_mv pdc_adma scsi_wait_scan"
+MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc scsi_wait_scan"
+
+# Hardware (Network)
+MODULES_NET="e1000 tg3"
+
+# Hardware (Pluggable)
+MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
+MODULES_PCMCIA="pcmcia_core yenta_socket i82365 ds ide-cs firmware_class"
+MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
+
+# Filesystems
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
diff --git a/sparc64/modules_load b/sparc64/modules_load
index 5e8c368..b0f611e 100644
--- a/sparc64/modules_load
+++ b/sparc64/modules_load
@@ -1,5 +1,24 @@
-MODULES_SCSI="qla2xxx scsi_wait_scan"
-MODULES_FIREWIRE=""
-MODULES_ATARAID=""
-MODULES_PCMCIA=""
-MODULES_USB=""
+# Module groups for genkernel initrd/initramfs auto-loading
+
+# RAID
+MODULES_ATARAID="ataraid pdcraid hptraid"
+MODULES_DMRAID="dm-mod dm-mirror"
+MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
+MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
+MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
+
+# Hardware (IDE/SCSI/SATA)
+MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_pcmcia pata_isapnp pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 scsi_wait_scan"
+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 libata ata_piix sata_mv pdc_adma scsi_wait_scan"
+MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc scsi_wait_scan"
+
+# Hardware (Network)
+MODULES_NET="e1000 tg3"
+
+# Hardware (Pluggable)
+MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
+MODULES_PCMCIA="pcmcia_core yenta_socket i82365 ds ide-cs firmware_class"
+MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
+
+# Filesystems
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
diff --git a/um/modules_load b/um/modules_load
index 0054a39..b0f611e 100644
--- a/um/modules_load
+++ b/um/modules_load
@@ -3,40 +3,22 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 \
-raid5 raid6 raid10"
+MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 \
-raid5 raid6 raid10"
+MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 
 # Hardware (IDE/SCSI/SATA)
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 \
-pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_optidma \
-pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform \
-pata_serverworks pata_legacy pata_ns87410 pata_pcmcia pata_isapnp pata_ali \
-pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 \
-pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron \
-pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105"
-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 libata \
-ata_piix sata_mv pdc_adma scsi_wait_scan"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic \
-ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x \
-dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp \
-seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm \
-in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih \
-mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid \
-megaraid megaraid_mbox megaraid_mm megaraid_sas lpfc scsi_transport_fc scsi_wait_scan"
+MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_pcmcia pata_isapnp pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 scsi_wait_scan"
+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 libata ata_piix sata_mv pdc_adma scsi_wait_scan"
+MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc scsi_wait_scan"
 
 # Hardware (Network)
 MODULES_NET="e1000 tg3"
 
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia_core yenta_socket i82365 \
-ds ide-cs firmware_class"
-MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd \
-ohci-hcd usbhid sl811-hcd"
+MODULES_PCMCIA="pcmcia_core yenta_socket i82365 ds ide-cs firmware_class"
+MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 
 # Filesystems
 MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
diff --git a/x86/modules_load b/x86/modules_load
index 0054a39..b0f611e 100644
--- a/x86/modules_load
+++ b/x86/modules_load
@@ -3,40 +3,22 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 \
-raid5 raid6 raid10"
+MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 \
-raid5 raid6 raid10"
+MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 
 # Hardware (IDE/SCSI/SATA)
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 \
-pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_optidma \
-pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform \
-pata_serverworks pata_legacy pata_ns87410 pata_pcmcia pata_isapnp pata_ali \
-pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 \
-pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron \
-pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105"
-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 libata \
-ata_piix sata_mv pdc_adma scsi_wait_scan"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic \
-ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x \
-dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp \
-seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm \
-in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih \
-mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid \
-megaraid megaraid_mbox megaraid_mm megaraid_sas lpfc scsi_transport_fc scsi_wait_scan"
+MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_pcmcia pata_isapnp pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 scsi_wait_scan"
+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 libata ata_piix sata_mv pdc_adma scsi_wait_scan"
+MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc scsi_wait_scan"
 
 # Hardware (Network)
 MODULES_NET="e1000 tg3"
 
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia_core yenta_socket i82365 \
-ds ide-cs firmware_class"
-MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd \
-ohci-hcd usbhid sl811-hcd"
+MODULES_PCMCIA="pcmcia_core yenta_socket i82365 ds ide-cs firmware_class"
+MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 
 # Filesystems
 MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
diff --git a/x86_64/modules_load b/x86_64/modules_load
index 0054a39..b0f611e 100644
--- a/x86_64/modules_load
+++ b/x86_64/modules_load
@@ -3,40 +3,22 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 \
-raid5 raid6 raid10"
+MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 \
-raid5 raid6 raid10"
+MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 
 # Hardware (IDE/SCSI/SATA)
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 \
-pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_optidma \
-pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform \
-pata_serverworks pata_legacy pata_ns87410 pata_pcmcia pata_isapnp pata_ali \
-pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 \
-pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron \
-pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105"
-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 libata \
-ata_piix sata_mv pdc_adma scsi_wait_scan"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic \
-ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x \
-dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp \
-seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm \
-in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih \
-mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid \
-megaraid megaraid_mbox megaraid_mm megaraid_sas lpfc scsi_transport_fc scsi_wait_scan"
+MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_pcmcia pata_isapnp pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 scsi_wait_scan"
+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 libata ata_piix sata_mv pdc_adma scsi_wait_scan"
+MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc scsi_wait_scan"
 
 # Hardware (Network)
 MODULES_NET="e1000 tg3"
 
 # Hardware (Pluggable)
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia_core yenta_socket i82365 \
-ds ide-cs firmware_class"
-MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd \
-ohci-hcd usbhid sl811-hcd"
+MODULES_PCMCIA="pcmcia_core yenta_socket i82365 ds ide-cs firmware_class"
+MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 
 # Filesystems
 MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"