summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-04-14 15:54:50 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-04-14 15:54:50 +0000
commit9cfc249546dbdabbe50baa88eee19cfe6425ceff (patch)
treed5486abac0557c1307dc84acf8c8c33d9e55f8fd
parent0eb1834a3ce10a23dbf9358c328eb323fc5b280c (diff)
downloaddrakx-backup-do-not-use-9cfc249546dbdabbe50baa88eee19cfe6425ceff.tar
drakx-backup-do-not-use-9cfc249546dbdabbe50baa88eee19cfe6425ceff.tar.gz
drakx-backup-do-not-use-9cfc249546dbdabbe50baa88eee19cfe6425ceff.tar.bz2
drakx-backup-do-not-use-9cfc249546dbdabbe50baa88eee19cfe6425ceff.tar.xz
drakx-backup-do-not-use-9cfc249546dbdabbe50baa88eee19cfe6425ceff.zip
Add bcm5700 module to network.img on x86-64 & IA-64
-rw-r--r--kernel/list_modules.pm3
-rw-r--r--kernel/modules.pl2
2 files changed, 3 insertions, 2 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index 7f5879461..034f7436b 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -24,7 +24,8 @@ our %l = (
qw(depca dgrs dmfe e100 e1000 e2100 eepro eepro100 eexpress epic100 eth16i),
qw(ewrk3 hamachi hp hp-plus hp100 ibmtr),
qw(lance natsemi ne ne2k-pci ni5010 ni52 ni65 nvnet olympic pcnet32 plip rcpci), #old_tulip
- qw(sb1000 sis900 sk98lin smc-ultra smc9194 starfire tg3 tlan tmspci tulip via-rhine), #sktr
+ qw(sb1000 sis900 sk98lin smc-ultra smc9194 starfire tlan tmspci tulip via-rhine), #sktr
+ qw(tg3 bcm5700),
qw(wd winbond-840 yellowfin ns83820),
qw(iph5526), #- fibre channel
diff --git a/kernel/modules.pl b/kernel/modules.pl
index b09dfa42e..b8d712187 100644
--- a/kernel/modules.pl
+++ b/kernel/modules.pl
@@ -28,7 +28,7 @@ my @skip_modules_on_stage1 = (
qw(sktr tmspci ibmtr abyss), # alt token ring
qw(old_tulip rtl8139),
if_(arch() =~ /alpha|ppc/, qw(sb1000)),
- if_(arch() !~ /x86_64/, qw(tg3)),
+ if_(arch() !~ /x86_64|ia64/, qw(tg3 bcm5700)),
qw(
r8169
apa1480_cb