[kernel] r10619 - in dists/trunk/linux-2.6/debian/config: . alpha amd64 arm hppa i386 ia64 mips mipsel powerpc sparc
Maximilian Attems
maks at alioth.debian.org
Thu Feb 21 10:16:25 UTC 2008
Author: maks
Date: Thu Feb 21 10:16:24 2008
New Revision: 10619
Log:
topconfig centralize enabled USB_USBNET
nuke some dependent duplication of config variables,
already defined in topconfig.
Modified:
dists/trunk/linux-2.6/debian/config/alpha/config
dists/trunk/linux-2.6/debian/config/amd64/config
dists/trunk/linux-2.6/debian/config/arm/config
dists/trunk/linux-2.6/debian/config/arm/config.footbridge
dists/trunk/linux-2.6/debian/config/arm/config.versatile
dists/trunk/linux-2.6/debian/config/config
dists/trunk/linux-2.6/debian/config/hppa/config
dists/trunk/linux-2.6/debian/config/i386/config
dists/trunk/linux-2.6/debian/config/ia64/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.sb1-bcm91250a
dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
dists/trunk/linux-2.6/debian/config/powerpc/config
dists/trunk/linux-2.6/debian/config/sparc/config.sparc64
dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp
Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/config (original)
+++ dists/trunk/linux-2.6/debian/config/alpha/config Thu Feb 21 10:16:24 2008
@@ -1152,7 +1152,6 @@
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_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
Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config (original)
+++ dists/trunk/linux-2.6/debian/config/amd64/config Thu Feb 21 10:16:24 2008
@@ -1090,7 +1090,6 @@
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_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
Modified: dists/trunk/linux-2.6/debian/config/arm/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config Thu Feb 21 10:16:24 2008
@@ -26,4 +26,3 @@
# CONFIG_SCSI_QLA_ISCSI is not set
# CONFIG_SCSI_AIC94XX is not set
# CONFIG_SCSI_HPTIOP is not set
-CONFIG_USB_USBNET=m
Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.footbridge (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge Thu Feb 21 10:16:24 2008
@@ -1293,15 +1293,6 @@
# 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
#
Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.versatile (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.versatile Thu Feb 21 10:16:24 2008
@@ -701,23 +701,12 @@
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
Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config (original)
+++ dists/trunk/linux-2.6/debian/config/config Thu Feb 21 10:16:24 2008
@@ -1013,6 +1013,7 @@
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
Modified: dists/trunk/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config (original)
+++ dists/trunk/linux-2.6/debian/config/hppa/config Thu Feb 21 10:16:24 2008
@@ -592,7 +592,6 @@
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
Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config (original)
+++ dists/trunk/linux-2.6/debian/config/i386/config Thu Feb 21 10:16:24 2008
@@ -1307,7 +1307,6 @@
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_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
Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config (original)
+++ dists/trunk/linux-2.6/debian/config/ia64/config Thu Feb 21 10:16:24 2008
@@ -559,7 +559,6 @@
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
Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Thu Feb 21 10:16:24 2008
@@ -2171,21 +2171,11 @@
#
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_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
Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Thu Feb 21 10:16:24 2008
@@ -1301,23 +1301,12 @@
# 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_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
Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a Thu Feb 21 10:16:24 2008
@@ -1302,7 +1302,6 @@
# 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_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
Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b Thu Feb 21 10:16:24 2008
@@ -1298,7 +1298,6 @@
# 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
#
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta Thu Feb 21 10:16:24 2008
@@ -2172,21 +2172,11 @@
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
#
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta Thu Feb 21 10:16:24 2008
@@ -1302,23 +1302,12 @@
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
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt Thu Feb 21 10:16:24 2008
@@ -1017,23 +1017,11 @@
# 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
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a Thu Feb 21 10:16:24 2008
@@ -1303,7 +1303,6 @@
# 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_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
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b Thu Feb 21 10:16:24 2008
@@ -1299,7 +1299,6 @@
# CONFIG_USB_STV680 is not set
# CONFIG_USB_PWC is not set
-# CONFIG_USB_USBNET is not set
CONFIG_USB_MON=y
#
Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config (original)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config Thu Feb 21 10:16:24 2008
@@ -864,7 +864,6 @@
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_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
Modified: dists/trunk/linux-2.6/debian/config/sparc/config.sparc64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config.sparc64 (original)
+++ dists/trunk/linux-2.6/debian/config/sparc/config.sparc64 Thu Feb 21 10:16:24 2008
@@ -120,7 +120,6 @@
# 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
Modified: dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp (original)
+++ dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp Thu Feb 21 10:16:24 2008
@@ -120,7 +120,6 @@
# 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
More information about the Kernel-svn-changes
mailing list