diff --git a/debian/changelog b/debian/changelog index 6dff79205..b07973bb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ linux-2.6 (3.1.0~rc3-1~experimental.1) UNRELEASED; urgency=low * 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 Wed, 27 Jul 2011 23:58:10 +0200 diff --git a/debian/config/config b/debian/config/config index fb43e4e9e..53ff85140 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1881,6 +1881,7 @@ CONFIG_SMCTR=m CONFIG_DE2104X_DSL=0 CONFIG_TULIP_NAPI=y CONFIG_TULIP_NAPI_HW_MITIGATION=y +# CONFIG_DE4X5 is not set CONFIG_ULI526X=m ## diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 70454a6a7..d2005b77f 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -326,7 +326,6 @@ CONFIG_NET_TULIP=y 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 diff --git a/debian/config/ia64/config b/debian/config/ia64/config index c55bdf201..9f2595af8 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -455,7 +455,6 @@ CONFIG_DE2104X=m 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 diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 6d16226d0..fe55e2b3b 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -890,7 +890,6 @@ CONFIG_DE2104X=m 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 diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index c619e38ef..152bd7706 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -675,7 +675,6 @@ CONFIG_TULIP=m # 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 diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index df4c1d15e..746f703cf 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -679,7 +679,6 @@ CONFIG_TULIP=m # 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 diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index a6e8f6a6c..873cd41f5 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -384,7 +384,6 @@ CONFIG_E100=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m -CONFIG_DE4X5=m CONFIG_WINBOND_840=m CONFIG_DM9102=m CONFIG_ULI526X=m diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index 7b77fd808..c8d372239 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -486,7 +486,6 @@ CONFIG_TULIP=y 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 diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 9840ec32f..7b0b8354f 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -559,7 +559,6 @@ CONFIG_DE2104X=m 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 diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 317edbe79..4e256776f 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -329,7 +329,6 @@ CONFIG_NET_TULIP=y 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