From 35d60d9a7b6f1b58a0dd943367dd2c077e92bf94 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Mon, 9 Mar 2009 09:59:11 +0000 Subject: [PATCH] topconfig centralize USB_NET_CDC_SUBSET options allows to nuke various drivers/net/usb/Kconfig blocks. svn path=/dists/trunk/linux-2.6/; revision=13045 --- debian/config/alpha/config | 9 --------- debian/config/amd64/config | 9 --------- debian/config/config | 5 +++++ debian/config/i386/config | 9 --------- debian/config/ia64/config | 9 --------- debian/config/mips/config.4kc-malta | 9 --------- debian/config/mips/config.5kc-malta | 10 ---------- debian/config/mips/config.sb1-bcm91250a | 9 --------- debian/config/mipsel/config.4kc-malta | 9 --------- debian/config/mipsel/config.5kc-malta | 10 ---------- debian/config/mipsel/config.r5k-cobalt | 9 --------- debian/config/mipsel/config.sb1-bcm91250a | 9 --------- debian/config/powerpc/config | 9 --------- debian/config/sparc/config.sparc64 | 9 --------- debian/config/sparc/config.sparc64-smp | 9 --------- 15 files changed, 5 insertions(+), 128 deletions(-) diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 1ff6669ca..e83c1fbda 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -862,15 +862,6 @@ CONFIG_WINBOND_840=m CONFIG_DM9102=m CONFIG_PCMCIA_XIRCOM=m -## -## file: drivers/net/usb/Kconfig -## -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/amd64/config b/debian/config/amd64/config index 6082d3b8c..b53ae5ad2 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -1001,15 +1001,6 @@ CONFIG_WINBOND_840=m CONFIG_DM9102=m CONFIG_PCMCIA_XIRCOM=m -## -## file: drivers/net/usb/Kconfig -## -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/config b/debian/config/config index c42c0b7f0..c04417666 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1370,6 +1370,11 @@ CONFIG_USB_NET_PLUSB=m CONFIG_USB_NET_MCS7830=m CONFIG_USB_NET_RNDIS_HOST=m CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y CONFIG_USB_KC2190=y CONFIG_USB_NET_ZAURUS=m diff --git a/debian/config/i386/config b/debian/config/i386/config index 32d574812..f6babe8c2 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -1193,15 +1193,6 @@ CONFIG_WINBOND_840=m CONFIG_DM9102=m CONFIG_PCMCIA_XIRCOM=m -## -## file: drivers/net/usb/Kconfig -## -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/ia64/config b/debian/config/ia64/config index fa29db961..d6f5045f4 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -548,15 +548,6 @@ CONFIG_WINBOND_840=m CONFIG_DM9102=m CONFIG_PCMCIA_XIRCOM=m -## -## file: drivers/net/usb/Kconfig -## -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index 320b43870..f758e41e5 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -1035,15 +1035,6 @@ CONFIG_DE4X5=m CONFIG_DM9102=m # CONFIG_ULI526X is not set -## -## file: drivers/net/usb/Kconfig -## -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 235307633..405a21e86 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1255,16 +1255,6 @@ CONFIG_DE4X5=m CONFIG_DM9102=m # CONFIG_ULI526X is not set -## -## file: drivers/net/usb/Kconfig -## -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y -CONFIG_USB_KC2190=y - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index f4feb4c5f..b92f8635b 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -592,15 +592,6 @@ CONFIG_VIA_RHINE=m ## # CONFIG_NET_TULIP is not set -## -## file: drivers/net/usb/Kconfig -## -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta index 4ba3d252d..0f202305b 100644 --- a/debian/config/mipsel/config.4kc-malta +++ b/debian/config/mipsel/config.4kc-malta @@ -1034,15 +1034,6 @@ CONFIG_DE4X5=m CONFIG_DM9102=m # CONFIG_ULI526X is not set -## -## file: drivers/net/usb/Kconfig -## -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta index 8cf6a90d5..92fa31df3 100644 --- a/debian/config/mipsel/config.5kc-malta +++ b/debian/config/mipsel/config.5kc-malta @@ -1255,16 +1255,6 @@ CONFIG_DE4X5=m CONFIG_DM9102=m # CONFIG_ULI526X is not set -## -## file: drivers/net/usb/Kconfig -## -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y -CONFIG_USB_KC2190=y - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index 36e3cfa23..30a74d7bd 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -561,15 +561,6 @@ CONFIG_TULIP_MMIO=y # CONFIG_DM9102 is not set # CONFIG_ULI526X is not set -## -## file: drivers/net/usb/Kconfig -## -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -# CONFIG_USB_EPSON2888 is not set - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/mipsel/config.sb1-bcm91250a b/debian/config/mipsel/config.sb1-bcm91250a index 7ac107ed7..049faffff 100644 --- a/debian/config/mipsel/config.sb1-bcm91250a +++ b/debian/config/mipsel/config.sb1-bcm91250a @@ -592,15 +592,6 @@ CONFIG_VIA_RHINE=m ## # CONFIG_NET_TULIP is not set -## -## file: drivers/net/usb/Kconfig -## -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 1f9bea65f..2049e3b30 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -632,15 +632,6 @@ CONFIG_WINBOND_840=m CONFIG_DM9102=m CONFIG_PCMCIA_XIRCOM=m -## -## file: drivers/net/usb/Kconfig -## -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/sparc/config.sparc64 b/debian/config/sparc/config.sparc64 index 3fc9c5b77..9bc1ee2a5 100644 --- a/debian/config/sparc/config.sparc64 +++ b/debian/config/sparc/config.sparc64 @@ -254,15 +254,6 @@ CONFIG_TULIP=m CONFIG_WINBOND_840=m CONFIG_DM9102=m -## -## file: drivers/net/usb/Kconfig -## -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y - ## ## file: drivers/sbus/char/Kconfig ## diff --git a/debian/config/sparc/config.sparc64-smp b/debian/config/sparc/config.sparc64-smp index 53e4ce7b7..d0beb005d 100644 --- a/debian/config/sparc/config.sparc64-smp +++ b/debian/config/sparc/config.sparc64-smp @@ -257,15 +257,6 @@ CONFIG_TULIP=m CONFIG_WINBOND_840=m CONFIG_DM9102=m -## -## file: drivers/net/usb/Kconfig -## -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y - ## ## file: drivers/sbus/char/Kconfig ##