[powerpc,x86] Fold nic-extra-modules into nic-modules

svn path=/dists/trunk/linux/; revision=20244
This commit is contained in:
Ben Hutchings 2013-06-11 03:28:31 +00:00
parent 505dfa5c73
commit 374d054212
12 changed files with 140 additions and 147 deletions

1
debian/changelog vendored
View File

@ -13,6 +13,7 @@ linux (3.10~rc5-1~exp1) UNRELEASED; urgency=low
- Remove obsolete eth1394 and firewire-core-modules dependency from
nic-modules
- Move ide-modules and ide-core-modules into ia64 configuration
- [powerpc,x86] Fold nic-extra-modules into nic-modules
-- Ben Hutchings <ben@decadent.org.uk> Mon, 03 Jun 2013 13:21:56 +0100

View File

@ -1 +0,0 @@
#include <nic-extra-modules>

View File

@ -1 +0,0 @@
#include <nic-extra-modules>

View File

@ -1,2 +1 @@
#include <nic-modules>
#include <nic-extra-modules>

View File

@ -1,110 +0,0 @@
alx ?
amd8111e ?
cs89x0 ?
dl2k
dmfe
enc28j60
et131x ?
forcedeth ?
hamachi
igb
ipg ?
lance ?
ne ?
ne2 ?
ni65 ?
niu ?
r8169
rrunner ?
skfp
sky2
skge
smc-ultra ?
tlan ?
typhoon
yellowfin
3c509 ?
3c515 ?
3c523 ?
3c527 ?
8139cp
epic100
fealnx
ns83820
smc9194 ?
starfire
sundance
arlan ?
de2104x ?
defxx ?
e1000 ?
e1000e ?
ixgb ?
ixgbe ?
pcnet32 ?
s2io ?
sis190 ?
sis900 ?
via-rhine ?
via-velocity ?
wd ?
bnx2 ?
bnx2x ?
cassini ?
cxgb ?
sis190 ?
skge ?
uli526x ?
sky2 ?
acenic ?
netxen_nic ?
qla3xxx ?
cxgb3 ?
atl1 ?
atl1c ?
atl1e ?
atl2 ?
r6040
sfc
jme ?
enic ?
be2net ?
myri10ge ?
# inet_lro is shared but now only used by myri10ge (and the iw_nes IB driver)
inet_lro ?
sc92031 ?
qlcnic ?
bna ?
cxgb4 ?
cxgb4vf ?
igbvf ?
ixgbevf ?
mlx4_en ?
vxge ?
pch_gbe ?
qlge ?
smsc9420 ?
tehuti ?
# phy drivers
# broadcom is in nic-modules
cicada ?
davicom ?
et1011c ?
icplus ?
lxt ?
marvell ?
mdio-bitbang ?
micrel ?
national ?
qsemi ?
realtek ?
smsc ?
ste10Xp ?
vitesse ?
# VMWare
vmxnet3 ?
# VLAN
8021q

View File

@ -1,13 +1,115 @@
# Some historically common net drivers
3c509 ?
3c515 ?
3c523 ?
3c527 ?
3c59x
8139cp
8139too
acenic ?
alx ?
amd8111e ?
arlan ?
atl1 ?
atl1c ?
atl1e ?
atl2 ?
be2net ?
bna ?
bnx2 ?
bnx2x ?
cassini ?
cs89x0 ?
cxgb ?
cxgb3 ?
cxgb4 ?
cxgb4vf ?
de2104x ?
defxx ?
dl2k
dmfe
e100
e1000 ?
e1000e ?
enc28j60
enic ?
epic100
et131x ?
fealnx
forcedeth ?
hamachi
igb
igbvf ?
ipg ?
ixgb ?
ixgbe ?
ixgbevf ?
jme ?
lance ?
mlx4_en ?
myri10ge ?
natsemi
ne ?
ne2 ?
ne2k-pci
netxen_nic ?
ni65 ?
niu ?
ns83820
pch_gbe ?
pcnet32 ?
qla3xxx ?
qlcnic ?
qlge ?
r6040
r8169
rrunner ?
s2io ?
sc92031 ?
sfc
sis190 ?
sis900 ?
skfp
skge
sky2
smc-ultra ?
smc9194 ?
smsc9420 ?
starfire
sundance
tehuti ?
tg3 ?
tlan ?
tulip
typhoon
uli526x ?
via-rhine ?
via-velocity ?
vmxnet3 ?
vxge ?
wd ?
winbond-840
xen-netfront ?
yellowfin
# PHY driver, may be needed by tg3
# inet_lro is shared but now only used by myri10ge (and the iw_nes IB driver)
inet_lro ?
# phy drivers
broadcom ?
cicada ?
davicom ?
et1011c ?
icplus ?
lxt ?
marvell ?
mdio-bitbang ?
micrel ?
national ?
qsemi ?
realtek ?
smsc ?
ste10Xp ?
vitesse ?
# VLAN
8021q

View File

@ -10,16 +10,12 @@ Description: Linux kernel binary image for the Debian installer
Debian system.
Package: nic-modules
Depends: kernel-image, nic-shared-modules, core-modules
Priority: standard
Description: Common NIC drivers
This package contains common NIC drivers for the kernel.
Package: nic-extra-modules
Depends: kernel-image, nic-shared-modules, core-modules, i2c-modules, crc-modules
Provides: nic-extra-modules
Priority: standard
Description: Rare NIC drivers
This package contains rare NIC drivers for the kernel.
Description: NIC drivers
This package contains Ethernet and some paravirtualised network drivers
for the kernel.
Package: nic-wireless-modules
Depends: kernel-image, nic-shared-modules, core-modules, usb-modules, mmc-modules, pcmcia-modules, crc-modules

View File

@ -1,17 +0,0 @@
dl2k
fealnx
hamachi
ixgb
ns83820
r8169
s2io
starfire
tlan
de2104x
dmfe
winbond-840
prism54 ?
p54pci
p54usb
yellowfin
8021q

View File

@ -1 +1,28 @@
#include "../powerpc/nic-modules"
3c59x
8139too
de2104x
dl2k
dmfe
e100
fealnx
hamachi
ixgb
natsemi
ne2k-pci
ns83820
p54pci
p54usb
prism54 ?
r8169
s2io
starfire
tg3 ?
tlan
tulip
winbond-840
winbond-840
yellowfin
broadcom ?
8021q

View File

@ -1,4 +0,0 @@
#include "../powerpc/nic-extra-modules"
ehea
ps3_gelic

View File

@ -1,5 +1,7 @@
#include "../powerpc/nic-modules"
ehea
ibmveth
spidernet
pasemi_mac ?
ps3_gelic
spidernet

View File

@ -1 +0,0 @@
#include <nic-extra-modules>