From ae9b856f039cc018017014783e6027b353c6109a Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Thu, 21 Feb 2008 10:16:24 +0000 Subject: [PATCH] topconfig centralize enabled USB_USBNET nuke some dependent duplication of config variables, already defined in topconfig. svn path=/dists/trunk/linux-2.6/; revision=10619 --- debian/config/alpha/config | 2 -- debian/config/amd64/config | 2 -- debian/config/arm/config | 1 - debian/config/arm/config.footbridge | 9 --------- debian/config/arm/config.versatile | 11 ----------- debian/config/config | 1 + debian/config/hppa/config | 1 - debian/config/i386/config | 2 -- debian/config/ia64/config | 1 - debian/config/mips/config.4kc-malta | 11 ----------- debian/config/mips/config.5kc-malta | 12 ------------ debian/config/mips/config.sb1-bcm91250a | 2 -- debian/config/mips/config.sb1a-bcm91480b | 1 - debian/config/mipsel/config.4kc-malta | 10 ---------- debian/config/mipsel/config.5kc-malta | 11 ----------- debian/config/mipsel/config.r5k-cobalt | 12 ------------ debian/config/mipsel/config.sb1-bcm91250a | 2 -- debian/config/mipsel/config.sb1a-bcm91480b | 1 - debian/config/powerpc/config | 2 -- debian/config/sparc/config.sparc64 | 1 - debian/config/sparc/config.sparc64-smp | 1 - 21 files changed, 1 insertion(+), 95 deletions(-) diff --git a/debian/config/alpha/config b/debian/config/alpha/config index c5799f063..541936923 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -1152,7 +1152,6 @@ CONFIG_USB_SN9C102=m CONFIG_USB_STV680=m CONFIG_USB_W9968CF=m CONFIG_USB_PWC=m -CONFIG_USB_USBNET=m CONFIG_USB_ALI_M5632=y CONFIG_USB_AN2720=y CONFIG_USB_BELKIN=y @@ -1176,7 +1175,6 @@ CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_NET2280=y -CONFIG_USB_NET2280=m # CONFIG_USB_GADGET_PXA2XX is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set diff --git a/debian/config/amd64/config b/debian/config/amd64/config index 5ebc44c4b..fbdd275e9 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -1090,7 +1090,6 @@ CONFIG_USB_SN9C102=m CONFIG_USB_STV680=m CONFIG_USB_W9968CF=m CONFIG_USB_PWC=m -CONFIG_USB_USBNET=m CONFIG_USB_ALI_M5632=y CONFIG_USB_AN2720=y CONFIG_USB_BELKIN=y @@ -1114,7 +1113,6 @@ CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_NET2280=y -CONFIG_USB_NET2280=m # CONFIG_USB_GADGET_PXA2XX is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set diff --git a/debian/config/arm/config b/debian/config/arm/config index 6176dfe3f..9650148ee 100644 --- a/debian/config/arm/config +++ b/debian/config/arm/config @@ -26,4 +26,3 @@ CONFIG_TMPFS=y # CONFIG_SCSI_QLA_ISCSI is not set # CONFIG_SCSI_AIC94XX is not set # CONFIG_SCSI_HPTIOP is not set -CONFIG_USB_USBNET=m diff --git a/debian/config/arm/config.footbridge b/debian/config/arm/config.footbridge index 4d897f8c5..99731448c 100644 --- a/debian/config/arm/config.footbridge +++ b/debian/config/arm/config.footbridge @@ -1293,15 +1293,6 @@ CONFIG_USB_MOUSE=m # CONFIG_USB_STV680 is not set # CONFIG_USB_W9968CF is not set # CONFIG_USB_PWC is not set -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_CDCETHER=m -# CONFIG_USB_NET_GL620A is not set -CONFIG_USB_NET_NET1080=m -# CONFIG_USB_NET_PLUSB is not set -# CONFIG_USB_NET_RNDIS_HOST is not set -# CONFIG_USB_NET_CDC_SUBSET is not set -CONFIG_USB_NET_ZAURUS=m CONFIG_USB_MON=y # diff --git a/debian/config/arm/config.versatile b/debian/config/arm/config.versatile index 05fb69eb4..e836b9642 100644 --- a/debian/config/arm/config.versatile +++ b/debian/config/arm/config.versatile @@ -701,23 +701,12 @@ CONFIG_HOSTAP_PLX=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set # CONFIG_RT2X00 is not set -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -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 CONFIG_WAN=y # CONFIG_LANMEDIA is not set # CONFIG_HDLC is not set diff --git a/debian/config/config b/debian/config/config index f22f01908..65739cddc 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1013,6 +1013,7 @@ CONFIG_USB_CATC=m CONFIG_USB_KAWETH=m CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_DM9601=m diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 5fe73926a..e3de1b765 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -592,7 +592,6 @@ CONFIG_USB_KBD=m CONFIG_USB_MOUSE=m # CONFIG_USB_MDC800 is not set # CONFIG_USB_MICROTEK is not set -# CONFIG_USB_USBNET is not set # CONFIG_USB_ZD1201 is not set # CONFIG_USB_USS720 is not set # CONFIG_USB_AUERSWALD is not set diff --git a/debian/config/i386/config b/debian/config/i386/config index 71a0711c1..1fafb94ef 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -1307,7 +1307,6 @@ CONFIG_USB_SE401=m CONFIG_USB_SN9C102=m CONFIG_USB_STV680=m CONFIG_USB_PWC=m -CONFIG_USB_USBNET=m CONFIG_USB_ALI_M5632=y CONFIG_USB_AN2720=y CONFIG_USB_BELKIN=y @@ -1331,7 +1330,6 @@ CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_NET2280=y -CONFIG_USB_NET2280=m # CONFIG_USB_GADGET_PXA2XX is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set diff --git a/debian/config/ia64/config b/debian/config/ia64/config index 4ab52fbf3..e7daab382 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -559,7 +559,6 @@ CONFIG_USB_SN9C102=m CONFIG_USB_STV680=m CONFIG_USB_W9968CF=m CONFIG_USB_PWC=m -CONFIG_USB_USBNET=m CONFIG_USB_ALI_M5632=y CONFIG_USB_AN2720=y CONFIG_USB_BELKIN=y diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index 4a821a781..f9f42831d 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -2171,21 +2171,11 @@ CONFIG_USB_MOUSE=m # CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -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_NET_ZAURUS=m CONFIG_USB_MON=y # @@ -2233,7 +2223,6 @@ CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_SELECTED=y CONFIG_USB_GADGET_NET2280=y -CONFIG_USB_NET2280=m # CONFIG_USB_GADGET_PXA2XX is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index eb5a2740b..9ce914211 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1301,23 +1301,12 @@ CONFIG_BCM43XX_DMA_AND_PIO_MODE=y # CONFIG_BCM43XX_PIO_MODE is not set CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -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 CONFIG_WAN=y CONFIG_LANMEDIA=m CONFIG_HDLC=m @@ -2510,7 +2499,6 @@ CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_SELECTED=y CONFIG_USB_GADGET_NET2280=y -CONFIG_USB_NET2280=m # CONFIG_USB_GADGET_PXA2XX is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index 2787420c1..687c99a81 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -1302,7 +1302,6 @@ CONFIG_USB_ET61X251=m # CONFIG_USB_SN9C102 is not set # CONFIG_USB_STV680 is not set # CONFIG_USB_PWC is not set -# CONFIG_USB_USBNET is not set CONFIG_USB_MON=y # @@ -1555,7 +1554,6 @@ CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin" -CONFIG_USB_NET2280=m CONFIG_USB_ALI_M5632=y CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin" CONFIG_USB_FILE_STORAGE=m diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index 98078f36b..5fd167f8f 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -1298,7 +1298,6 @@ CONFIG_USB_ET61X251=m # CONFIG_USB_SN9C102 is not set # CONFIG_USB_STV680 is not set # CONFIG_USB_PWC is not set -# CONFIG_USB_USBNET is not set CONFIG_USB_MON=y # diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta index 4c087ae99..406ee86ed 100644 --- a/debian/config/mipsel/config.4kc-malta +++ b/debian/config/mipsel/config.4kc-malta @@ -2172,21 +2172,11 @@ CONFIG_USB_MOUSE=m CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -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_NET_ZAURUS=m CONFIG_USB_MON=y # diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta index b761e7379..09d173887 100644 --- a/debian/config/mipsel/config.5kc-malta +++ b/debian/config/mipsel/config.5kc-malta @@ -1302,23 +1302,12 @@ CONFIG_BCM43XX_DMA_AND_PIO_MODE=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -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 CONFIG_WAN=y CONFIG_LANMEDIA=m CONFIG_HDLC=m diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index 77c2fc8d5..c86cf8aaa 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -1017,23 +1017,11 @@ CONFIG_USB_ET61X251=m # CONFIG_USB_STV680 is not set # CONFIG_USB_PWC is not set -# -# USB Network Adapters -# -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_PLUSB=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 is not set -CONFIG_USB_NET_ZAURUS=m CONFIG_USB_ZD1201=m CONFIG_USB_MON=y diff --git a/debian/config/mipsel/config.sb1-bcm91250a b/debian/config/mipsel/config.sb1-bcm91250a index cb231e3f8..581b6f4ad 100644 --- a/debian/config/mipsel/config.sb1-bcm91250a +++ b/debian/config/mipsel/config.sb1-bcm91250a @@ -1303,7 +1303,6 @@ CONFIG_USB_ET61X251=m # CONFIG_USB_STV680 is not set # CONFIG_USB_PWC is not set -# CONFIG_USB_USBNET is not set CONFIG_USB_MON=y # @@ -1618,7 +1617,6 @@ CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin" -CONFIG_USB_NET2280=m CONFIG_USB_ALI_M5632=y CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin" CONFIG_USB_FILE_STORAGE=m diff --git a/debian/config/mipsel/config.sb1a-bcm91480b b/debian/config/mipsel/config.sb1a-bcm91480b index 0f7c9a719..9707f00e8 100644 --- a/debian/config/mipsel/config.sb1a-bcm91480b +++ b/debian/config/mipsel/config.sb1a-bcm91480b @@ -1299,7 +1299,6 @@ CONFIG_USB_ET61X251=m # CONFIG_USB_STV680 is not set # CONFIG_USB_PWC is not set -# CONFIG_USB_USBNET is not set CONFIG_USB_MON=y # diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index ca802f79b..f5af3c98d 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -864,7 +864,6 @@ CONFIG_USB_SN9C102=m CONFIG_USB_STV680=m CONFIG_USB_W9968CF=m CONFIG_USB_PWC=m -CONFIG_USB_USBNET=m CONFIG_USB_ALI_M5632=y CONFIG_USB_AN2720=y CONFIG_USB_BELKIN=y @@ -887,7 +886,6 @@ CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_NET2280=y -CONFIG_USB_NET2280=m # CONFIG_USB_GADGET_PXA2XX is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set diff --git a/debian/config/sparc/config.sparc64 b/debian/config/sparc/config.sparc64 index 2d1a38d4a..3f54d5519 100644 --- a/debian/config/sparc/config.sparc64 +++ b/debian/config/sparc/config.sparc64 @@ -120,7 +120,6 @@ CONFIG_LOG_BUF_SHIFT=14 # USB port drivers # CONFIG_SENSORS_LM90 is not set # CONFIG_SENSORS_FSCHER is not set -CONFIG_USB_USBNET=m # CONFIG_SPARC64_PAGE_SIZE_512KB is not set # CONFIG_USB_IDMOUSE is not set # CONFIG_SENSORS_EEPROM is not set diff --git a/debian/config/sparc/config.sparc64-smp b/debian/config/sparc/config.sparc64-smp index b7beb2dc2..25ec30254 100644 --- a/debian/config/sparc/config.sparc64-smp +++ b/debian/config/sparc/config.sparc64-smp @@ -120,7 +120,6 @@ CONFIG_64BIT=y # USB port drivers # CONFIG_SENSORS_LM90 is not set # CONFIG_SENSORS_FSCHER is not set -CONFIG_USB_USBNET=m # CONFIG_SPARC64_PAGE_SIZE_512KB is not set # CONFIG_USB_IDMOUSE is not set # CONFIG_SENSORS_EEPROM is not set