[kernel] r18026 - in dists/trunk/linux-2.6/debian: . config config/hppa config/ia64 config/kernelarch-x86 config/mips config/mipsel config/powerpc config/sparc

[Ben Hutchings]

Author: benh
Date: Sun Aug 28 15:41:11 2011
New Revision: 18026

Log:
de4x5: Disable on all architectures except alpha (Closes: #639538)

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/hppa/config
   dists/trunk/linux-2.6/debian/config/ia64/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
   dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
   dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
   dists/trunk/linux-2.6/debian/config/powerpc/config
   dists/trunk/linux-2.6/debian/config/sparc/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Aug 28 11:45:26 2011	(r18025)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Aug 28 15:41:11 2011	(r18026)
@@ -23,6 +23,7 @@
   * media/dvb: Enable DVB_NET
   * media/rc: Enable IR_MCE_KBD_DECODER as module
   * gspca: Enable USB_GSPCA_SE401 as module
+  * de4x5: Disable on all architectures except alpha (Closes: #639538)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 27 Jul 2011 23:58:10 +0200
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Sun Aug 28 11:45:26 2011	(r18025)
+++ dists/trunk/linux-2.6/debian/config/config	Sun Aug 28 15:41:11 2011	(r18026)
@@ -1881,6 +1881,7 @@
 CONFIG_DE2104X_DSL=0
 CONFIG_TULIP_NAPI=y
 CONFIG_TULIP_NAPI_HW_MITIGATION=y
+# CONFIG_DE4X5 is not set
 CONFIG_ULI526X=m
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config	Sun Aug 28 11:45:26 2011	(r18025)
+++ dists/trunk/linux-2.6/debian/config/hppa/config	Sun Aug 28 15:41:11 2011	(r18026)
@@ -326,7 +326,6 @@
 CONFIG_TULIP=m
 # CONFIG_TULIP_MWI is not set
 CONFIG_TULIP_MMIO=y
-# CONFIG_DE4X5 is not set
 # CONFIG_WINBOND_840 is not set
 # CONFIG_DM9102 is not set
 CONFIG_PCMCIA_XIRCOM=m

Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config	Sun Aug 28 11:45:26 2011	(r18025)
+++ dists/trunk/linux-2.6/debian/config/ia64/config	Sun Aug 28 15:41:11 2011	(r18026)
@@ -455,7 +455,6 @@
 CONFIG_TULIP=m
 # CONFIG_TULIP_MWI is not set
 # CONFIG_TULIP_MMIO is not set
-CONFIG_DE4X5=y
 CONFIG_WINBOND_840=m
 CONFIG_DM9102=m
 CONFIG_PCMCIA_XIRCOM=m

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sun Aug 28 11:45:26 2011	(r18025)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sun Aug 28 15:41:11 2011	(r18026)
@@ -890,7 +890,6 @@
 CONFIG_TULIP=m
 # CONFIG_TULIP_MWI is not set
 # CONFIG_TULIP_MMIO is not set
-CONFIG_DE4X5=m
 CONFIG_WINBOND_840=m
 CONFIG_DM9102=m
 CONFIG_PCMCIA_XIRCOM=m

Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Sun Aug 28 11:45:26 2011	(r18025)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Sun Aug 28 15:41:11 2011	(r18026)
@@ -675,7 +675,6 @@
 # CONFIG_TULIP_MWI is not set
 # CONFIG_TULIP_MMIO is not set
 # CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
 # CONFIG_WINBOND_840 is not set
 CONFIG_DM9102=m
 # CONFIG_ULI526X is not set

Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Sun Aug 28 11:45:26 2011	(r18025)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Sun Aug 28 15:41:11 2011	(r18026)
@@ -679,7 +679,6 @@
 # CONFIG_TULIP_MWI is not set
 # CONFIG_TULIP_MMIO is not set
 # CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
 # CONFIG_WINBOND_840 is not set
 CONFIG_DM9102=m
 # CONFIG_ULI526X is not set

Modified: dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32	Sun Aug 28 11:45:26 2011	(r18025)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32	Sun Aug 28 15:41:11 2011	(r18026)
@@ -384,7 +384,6 @@
 CONFIG_NET_TULIP=y
 CONFIG_DE2104X=m
 CONFIG_TULIP=m
-CONFIG_DE4X5=m
 CONFIG_WINBOND_840=m
 CONFIG_DM9102=m
 CONFIG_ULI526X=m

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt	Sun Aug 28 11:45:26 2011	(r18025)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt	Sun Aug 28 15:41:11 2011	(r18026)
@@ -486,7 +486,6 @@
 CONFIG_TULIP_MWI=y
 CONFIG_TULIP_MMIO=y
 # CONFIG_TULIP_NAPI is not set
-# CONFIG_DE4X5 is not set
 # CONFIG_WINBOND_840 is not set
 # CONFIG_DM9102 is not set
 # CONFIG_ULI526X is not set

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config	Sun Aug 28 11:45:26 2011	(r18025)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config	Sun Aug 28 15:41:11 2011	(r18026)
@@ -559,7 +559,6 @@
 CONFIG_TULIP=m
 # CONFIG_TULIP_MWI is not set
 # CONFIG_TULIP_MMIO is not set
-CONFIG_DE4X5=m
 CONFIG_WINBOND_840=m
 CONFIG_DM9102=m
 CONFIG_PCMCIA_XIRCOM=m

Modified: dists/trunk/linux-2.6/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config	Sun Aug 28 11:45:26 2011	(r18025)
+++ dists/trunk/linux-2.6/debian/config/sparc/config	Sun Aug 28 15:41:11 2011	(r18026)
@@ -329,7 +329,6 @@
 CONFIG_TULIP=m
 # CONFIG_TULIP_MWI is not set
 # CONFIG_TULIP_MMIO is not set
-# CONFIG_DE4X5 is not set
 CONFIG_WINBOND_840=m
 CONFIG_DM9102=m