From dd481d0990889bef66e535ffee9404ebad40b1a4 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 7 Jul 2004 06:44:07 +0000 Subject: have only usb-interfaces in bus/usb --- kernel/list_modules.pm | 3 ++- kernel/modules.pl | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'kernel') diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm index 4967884e4..5cd953878 100644 --- a/kernel/list_modules.pm +++ b/kernel/list_modules.pm @@ -99,11 +99,12 @@ our %l = ( bus => { - usb => [ qw(usb-uhci usb-ohci ehci-hcd uhci-hcd ohci-hcd usbkbd keybdev) ], + usb => [ qw(usb-uhci usb-ohci ehci-hcd uhci-hcd ohci-hcd) ], firewire => [ qw(ohci1394) ], pcmcia => [ if_(arch() !~ /^sparc/, qw(tcic i82365 i82092 yenta_socket)), # cb_enabler ], + usb_keyboard => [ qw(usbkbd keybdev) ], #serial_cs #ftl_cs 3c575_cb apa1480_cb epic_cb serial_cb tulip_cb iflash2+_mtd iflash2_mtd #cb_enabler diff --git a/kernel/modules.pl b/kernel/modules.pl index edca4f713..587674e8f 100644 --- a/kernel/modules.pl +++ b/kernel/modules.pl @@ -100,9 +100,9 @@ my @modules_removed_from_stage1 = flatten_and_check(\%modules_removed_from_stage my %images = ( pcmcia => 'fs/cdrom disk/cdrom|raw|pcmcia bus/pcmcia', cdrom => 'fs/cdrom disk/cdrom|raw|scsi', - network => 'bus/usb|pcmcia disk/raw|usb', + network => 'bus/usb|usb_keyboard|pcmcia disk/raw|usb', network_drivers => 'fs/network network/main|pcmcia|usb|raw|gigabit', - 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|gigabit bus/firewire disk/firewire', + all => 'fs/cdrom disk/cdrom|raw bus/usb|usb_keyboard disk/usb|scsi fs/loopback|local bus/pcmcia disk/pcmcia|hardware_raid fs/network network/main|pcmcia|usb|raw|gigabit bus/firewire disk/firewire', ); my $verbose = "@ARGV" =~ /-v/; -- cgit v1.2.1