[kernel] r20244 - in dists/trunk/linux/debian: . installer installer/amd64/modules/amd64 installer/i386/modules/i386 installer/ia64/modules/ia64 installer/modules installer/powerpc/modules/powerpc installer/powerpc/modules/powerpc-powerpc-miboot installer/powerpc/modules/powerpc-powerpc64

[Ben Hutchings]

Author: benh
Date: Tue Jun 11 03:28:31 2013
New Revision: 20244

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

Deleted:
   dists/trunk/linux/debian/installer/amd64/modules/amd64/nic-extra-modules
   dists/trunk/linux/debian/installer/i386/modules/i386/nic-extra-modules
   dists/trunk/linux/debian/installer/modules/nic-extra-modules
   dists/trunk/linux/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-extra-modules
   dists/trunk/linux/debian/installer/powerpc/modules/powerpc-powerpc64/nic-extra-modules
   dists/trunk/linux/debian/installer/powerpc/modules/powerpc/nic-extra-modules
Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/installer/ia64/modules/ia64/nic-modules
   dists/trunk/linux/debian/installer/modules/nic-modules
   dists/trunk/linux/debian/installer/package-list
   dists/trunk/linux/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-modules
   dists/trunk/linux/debian/installer/powerpc/modules/powerpc-powerpc64/nic-modules

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Tue Jun 11 02:59:13 2013	(r20243)
+++ dists/trunk/linux/debian/changelog	Tue Jun 11 03:28:31 2013	(r20244)
@@ -13,6 +13,7 @@
     - 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 at decadent.org.uk>  Mon, 03 Jun 2013 13:21:56 +0100
 

Modified: dists/trunk/linux/debian/installer/ia64/modules/ia64/nic-modules
==============================================================================
--- dists/trunk/linux/debian/installer/ia64/modules/ia64/nic-modules	Tue Jun 11 02:59:13 2013	(r20243)
+++ dists/trunk/linux/debian/installer/ia64/modules/ia64/nic-modules	Tue Jun 11 03:28:31 2013	(r20244)
@@ -1,2 +1 @@
 #include <nic-modules>
-#include <nic-extra-modules>

Modified: dists/trunk/linux/debian/installer/modules/nic-modules
==============================================================================
--- dists/trunk/linux/debian/installer/modules/nic-modules	Tue Jun 11 02:59:13 2013	(r20243)
+++ dists/trunk/linux/debian/installer/modules/nic-modules	Tue Jun 11 03:28:31 2013	(r20244)
@@ -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

Modified: dists/trunk/linux/debian/installer/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/package-list	Tue Jun 11 02:59:13 2013	(r20243)
+++ dists/trunk/linux/debian/installer/package-list	Tue Jun 11 03:28:31 2013	(r20244)
@@ -10,16 +10,12 @@
  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

Modified: dists/trunk/linux/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-modules
==============================================================================
--- dists/trunk/linux/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-modules	Tue Jun 11 02:59:13 2013	(r20243)
+++ dists/trunk/linux/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-modules	Tue Jun 11 03:28:31 2013	(r20244)
@@ -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

Modified: dists/trunk/linux/debian/installer/powerpc/modules/powerpc-powerpc64/nic-modules
==============================================================================
--- dists/trunk/linux/debian/installer/powerpc/modules/powerpc-powerpc64/nic-modules	Tue Jun 11 02:59:13 2013	(r20243)
+++ dists/trunk/linux/debian/installer/powerpc/modules/powerpc-powerpc64/nic-modules	Tue Jun 11 03:28:31 2013	(r20244)
@@ -1,5 +1,7 @@
 #include "../powerpc/nic-modules"
 
+ehea
 ibmveth
-spidernet
 pasemi_mac ?
+ps3_gelic
+spidernet