[kernel] r22164 - in dists/trunk/linux/debian: . config config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Tue Dec  9 20:05:42 2014
New Revision: 22164

Log:
drivers/net: Enable ET131X as module for all architectures

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/config
   dists/trunk/linux/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Tue Dec  9 20:03:53 2014	(r22163)
+++ dists/trunk/linux/debian/changelog	Tue Dec  9 20:05:42 2014	(r22164)
@@ -16,6 +16,7 @@
     as modules
   * SCSI,xen: Enable XEN_SCSI_FRONTEND, XEN_SCSI_BACKEND as modules
   * SCSI: Re-enable LIBFCOE, FCOE, FCOE_FNIC, SCSI_BNX2X_FCOE as modules
+  * drivers/net: Enable ET131X as module for all architectures
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 09 Dec 2014 02:08:47 +0000
 

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Tue Dec  9 20:03:53 2014	(r22163)
+++ dists/trunk/linux/debian/config/config	Tue Dec  9 20:05:42 2014	(r22164)
@@ -2436,7 +2436,7 @@
 ## file: drivers/net/ethernet/agere/Kconfig
 ##
 CONFIG_NET_VENDOR_AGERE=y
-# CONFIG_ET131X is not set
+CONFIG_ET131X=m
 
 ##
 ## file: drivers/net/ethernet/alteon/Kconfig

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Tue Dec  9 20:03:53 2014	(r22163)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Tue Dec  9 20:05:42 2014	(r22164)
@@ -1387,11 +1387,6 @@
 CONFIG_CRYSTALHD=m
 
 ##
-## file: drivers/staging/et131x/Kconfig
-##
-CONFIG_ET131X=m
-
-##
 ## file: drivers/staging/gdm72xx/Kconfig
 ##
 CONFIG_WIMAX_GDM72XX=m