From 86793e058ed27688ac705f30728d87955222f87c Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 25 Jul 2002 23:23:12 +0000
Subject: reorder modules to have most used modules at the beginning of the
 mar's

---
 kernel/list_modules.pm |  2 +-
 kernel/modules.pl      | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index ce9ec9765..650befc24 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -75,7 +75,7 @@ our %l = (
     pcmcia => [ qw(aha152x_cs fdomain_cs nsp_cs qlogic_cs ide-cs) ], #ide_cs
     raw => [ qw(scsi_mod sd_mod) ],
     usb => [ qw(usb-storage) ],
-    cdrom => [ qw(ide-cd sr_mod cdrom) ],
+    cdrom => [ qw(ide-cd cdrom sr_mod) ],
   },
 
   ################################################################################
diff --git a/kernel/modules.pl b/kernel/modules.pl
index ac99a4919..4f5c948db 100644
--- a/kernel/modules.pl
+++ b/kernel/modules.pl
@@ -42,13 +42,13 @@ my @skip_modules_on_stage1 = (
 );
 
 my %images = (
-    network => 'fs/network network/main|raw bus/pcmcia',
-    cdrom   => 'fs/cdrom disk/cdrom|scsi|raw',
-    hd      => 'fs/local fs/loopback disk/scsi|hardware_raid|raw',
-    usb     => 'fs/network|cdrom bus/usb network/usb|raw disk/cdrom|usb|raw',
-    pcmcia  => 'fs/network|cdrom disk/cdrom|pcmcia|raw bus/pcmcia network/pcmcia|raw',
-    other   => 'network/main disk/scsi|hardware_raid ONLY_BIG fs/network network/raw fs/cdrom disk/cdrom|raw',
-    all     => 'fs/network|cdrom|loopback|local bus/pcmcia|usb network/main|pcmcia|usb|raw disk/cdrom|scsi|hardware_raid|pcmcia|usb|raw',
+    network => 'fs/network network/raw bus/pcmcia network/main',
+    hd      => 'disk/raw fs/local|loopback disk/scsi|hardware_raid',
+    other   => 'disk/scsi|hardware_raid network/main ONLY_BIG fs/cdrom disk/cdrom|raw fs/network network/raw',
+    pcmcia  => 'fs/cdrom disk/cdrom|raw|pcmcia bus/pcmcia fs/network network/pcmcia|raw',
+    cdrom   => 'fs/cdrom disk/cdrom|raw|scsi',
+    usb     => 'fs/cdrom disk/cdrom|raw bus/usb disk/usb fs/network network/usb|raw',
+    all     => 'fs/cdrom disk/cdrom|raw bus/usb disk/usb|scsi fs/loopback|local bus/pcmcia disk/pcmcia|hardware_raid fs/network network/main|pcmcia|usb|raw',
 );
 
 my $verbose = "@ARGV" =~ /-v/;
@@ -76,7 +76,7 @@ sub images {
 	    @modules = difference2(\@modules, \@skip_big_modules_on_stage1)
 	}
 	@modules = map { dependencies_closure($_) } @modules;
-	printf qq(%s_modules="%s"\n), $image, join(" ", map { "$_.o" } sort @modules);
+	printf qq(%s_modules="%s"\n), $image, join(" ", map { "$_.o" } @modules);
     }
 }
 
-- 
cgit v1.2.1