diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/list_modules.pm | 5 | ||||
| -rw-r--r-- | kernel/modules.pl | 9 |
2 files changed, 3 insertions, 11 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm index f64d308e2..02efadbec 100644 --- a/kernel/list_modules.pm +++ b/kernel/list_modules.pm @@ -74,7 +74,7 @@ our %l = ( if_(arch() =~ /^sparc/, qw(pluto)), if_(arch() !~ /alpha/ && arch() !~ /sparc/, qw(DAC960 dpt_i2o megaraid aacraid cciss cpqarray gdth i2o_block), - qw(cpqfc qla2200 qla2300 ataraid hptraid silraid pdcraid pdc-ultra), + qw(cpqfc qla2200 qla2300 ataraid hptraid silraid pdcraid pdc-ultra sata_promise sata_via), qw(ips ppa imm), ), ], @@ -92,7 +92,8 @@ our %l = ( usb => [ qw(usbcore usb-uhci usb-ohci ehci-hcd usbkbd keybdev input) ], firewire => [ qw(ohci1394 ieee1394) ], pcmcia => [ - if_(arch() !~ /^sparc/, qw(pcmcia_core tcic ds i82365 i82092 yenta_socket)), # cb_enabler + if_(arch() !~ /^x86_64|sparc/, qw(tcic i82365 i82092)), # doc says "older laptops" + if_(arch() !~ /^sparc/, qw(pcmcia_core ds yenta_socket)), # cb_enabler ], #serial_cs #ftl_cs 3c575_cb apa1480_cb epic_cb serial_cb tulip_cb iflash2+_mtd iflash2_mtd diff --git a/kernel/modules.pl b/kernel/modules.pl index 97231731d..c7154e4a5 100644 --- a/kernel/modules.pl +++ b/kernel/modules.pl @@ -25,24 +25,16 @@ my %modules_only_for_all_img = ( qw(3c501 3c503 3c505 3c507 3c515), # unused, hopefully? qw(eepro 82596 de620 depca ewrk3 cs89x0), - if_(arch() =~ /x86_64/, qw(orinoco_plx)), # don't support laptop for now - if_(arch() =~ /x86_64/, qw(hp100 epic100)), # old (nico) if_(arch() =~ /alpha|ppc/, qw(sb1000)), qw(iph5526), qw(ac3200 at1700 atp ni5010 ni52 ni65), #- unused from Jeff ], - 'bus/pcmcia' => [ - if_(arch() =~ /x86_64/, qw(pcmcia_core ds tcic yenta_socket)), # don't support laptop for now - if_(arch() =~ /x86_64/, qw(i82092 i82365)), # doco says "older laptops" - ], - 'disk/scsi' => [ # ISA cards: qw(NCR53c406a aha152x psi240i qlogicfas qlogicfc wd7000 sim710 t128 ultrastor), '53c7,8xx', qw(qla2x00 in2000 pas16 a100u2w seagate g_NCR5380), - if_(arch() =~ /x86_64/, qw(53c7,8xx nsp32 initio advansys atp870u)), #- old qw(AM53C974), # deprecated by tmscsim qw(u14-34f), #- duplicate from ultrastor.o #- still used, keeping them: qw(aha1542 sym53c416), @@ -53,7 +45,6 @@ my %modules_only_for_all_img = ( ], 'disk/hardware_raid' => [ - if_(arch() =~ /x86_64/, qw(ataraid)), #- old qw(i2o_block qla2200 qla2300 cpqfc DAC960 gdth pdc-ultra), ], ); |