[kernel] r10617 - 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
Wed Feb 20 14:14:49 UTC 2008
Author: maks
Date: Wed Feb 20 14:14:47 2008
New Revision: 10617
Log:
topconfig centralize usb net drivers
nuke any dup definition, don't allow to disable:
CONFIG_USB_CATC, CONFIG_USB_KAWETH, CONFIG_USB_PEGASUS, and
CONFIG_USB_RTL8150
some archs still have a dubious unset USB_USBNET,
that is left for the next exercice..
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.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 Wed Feb 20 14:14:47 2008
@@ -1152,10 +1152,6 @@
CONFIG_USB_STV680=m
CONFIG_USB_W9968CF=m
CONFIG_USB_PWC=m
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
CONFIG_USB_USBNET=m
CONFIG_USB_ALI_M5632=y
CONFIG_USB_AN2720=y
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 Wed Feb 20 14:14:47 2008
@@ -1090,10 +1090,6 @@
CONFIG_USB_STV680=m
CONFIG_USB_W9968CF=m
CONFIG_USB_PWC=m
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
CONFIG_USB_USBNET=m
CONFIG_USB_ALI_M5632=y
CONFIG_USB_AN2720=y
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 Wed Feb 20 14:14:47 2008
@@ -1293,14 +1293,6 @@
# CONFIG_USB_STV680 is not set
# CONFIG_USB_W9968CF is not set
# CONFIG_USB_PWC is not set
-
-#
-# USB Network Adapters
-#
-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
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 Wed Feb 20 14:14:47 2008
@@ -701,14 +701,6 @@
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
# CONFIG_RT2X00 is not set
-
-#
-# USB Network Adapters
-#
-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
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 Wed Feb 20 14:14:47 2008
@@ -1009,6 +1009,10 @@
#
# USB Network Adapters
#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=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 Wed Feb 20 14:14:47 2008
@@ -592,10 +592,6 @@
CONFIG_USB_MOUSE=m
# CONFIG_USB_MDC800 is not set
# CONFIG_USB_MICROTEK is not set
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
# CONFIG_USB_USBNET is not set
# CONFIG_USB_ZD1201 is not set
# CONFIG_USB_USS720 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 Wed Feb 20 14:14:47 2008
@@ -1307,10 +1307,6 @@
CONFIG_USB_SN9C102=m
CONFIG_USB_STV680=m
CONFIG_USB_PWC=m
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
CONFIG_USB_USBNET=m
CONFIG_USB_ALI_M5632=y
CONFIG_USB_AN2720=y
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 Wed Feb 20 14:14:47 2008
@@ -559,10 +559,6 @@
CONFIG_USB_STV680=m
CONFIG_USB_W9968CF=m
CONFIG_USB_PWC=m
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
CONFIG_USB_USBNET=m
CONFIG_USB_ALI_M5632=y
CONFIG_USB_AN2720=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 Wed Feb 20 14:14:47 2008
@@ -2171,14 +2171,6 @@
#
CONFIG_USB_MDC800=m
CONFIG_USB_MICROTEK=m
-
-#
-# USB Network Adapters
-#
-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
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 Wed Feb 20 14:14:47 2008
@@ -1301,14 +1301,6 @@
# CONFIG_BCM43XX_PIO_MODE is not set
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
-
-#
-# USB Network Adapters
-#
-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
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 Wed Feb 20 14:14:47 2008
@@ -1302,14 +1302,6 @@
# CONFIG_USB_SN9C102 is not set
# CONFIG_USB_STV680 is not set
# CONFIG_USB_PWC is not set
-
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
# CONFIG_USB_USBNET is not set
CONFIG_USB_MON=y
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 Wed Feb 20 14:14:47 2008
@@ -1298,14 +1298,6 @@
# CONFIG_USB_SN9C102 is not set
# CONFIG_USB_STV680 is not set
# CONFIG_USB_PWC is not set
-
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 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 Wed Feb 20 14:14:47 2008
@@ -2172,13 +2172,6 @@
CONFIG_USB_MDC800=m
CONFIG_USB_MICROTEK=m
-#
-# USB Network Adapters
-#
-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
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 Wed Feb 20 14:14:47 2008
@@ -1302,13 +1302,6 @@
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
-#
-# USB Network Adapters
-#
-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
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 Wed Feb 20 14:14:47 2008
@@ -1020,10 +1020,6 @@
#
# USB Network Adapters
#
-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
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 Wed Feb 20 14:14:47 2008
@@ -1303,13 +1303,6 @@
# CONFIG_USB_STV680 is not set
# CONFIG_USB_PWC is not set
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
# CONFIG_USB_USBNET is not set
CONFIG_USB_MON=y
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 Wed Feb 20 14:14:47 2008
@@ -1299,13 +1299,6 @@
# CONFIG_USB_STV680 is not set
# CONFIG_USB_PWC is not set
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 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 Wed Feb 20 14:14:47 2008
@@ -864,10 +864,6 @@
CONFIG_USB_STV680=m
CONFIG_USB_W9968CF=m
CONFIG_USB_PWC=m
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
CONFIG_USB_USBNET=m
CONFIG_USB_ALI_M5632=y
CONFIG_USB_AN2720=y
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 Wed Feb 20 14:14:47 2008
@@ -58,7 +58,6 @@
CONFIG_I2C_CHARDEV=m
CONFIG_SYSVIPC_COMPAT=y
# CONFIG_I2C_DEBUG_BUS is not set
-CONFIG_USB_KAWETH=m
# CONFIG_SPARC64_PAGE_SIZE_4MB is not set
# CONFIG_SCSI_IZIP_EPP16 is not set
# CONFIG_I2C_STUB is not set
@@ -128,7 +127,6 @@
# CONFIG_USB_USS720 is not set
CONFIG_SND_ALI5451=m
CONFIG_CDROM_PKTCDVD=m
-CONFIG_USB_CATC=m
CONFIG_MEGARAID_MM=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -205,7 +203,6 @@
# CONFIG_CPU_FREQ is not set
# CONFIG_VIDEO_DPC is not set
# CONFIG_8139TOO_PIO is not set
-# CONFIG_USB_RTL8150 is not set
CONFIG_BLK_DEV_LOOP=y
CONFIG_SPARC64_PAGE_SIZE_8KB=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -333,7 +330,6 @@
CONFIG_SCSI_DMX3191D=m
# CONFIG_TULIP_MMIO is not set
CONFIG_USB_LED=m
-CONFIG_USB_PEGASUS=m
# CONFIG_SENSORS_LM77 is not set
CONFIG_USB_STORAGE_DPCM=y
# CONFIG_USB_LEGOTOWER 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 Wed Feb 20 14:14:47 2008
@@ -59,7 +59,6 @@
CONFIG_SYSVIPC_COMPAT=y
# CONFIG_I2C_DEBUG_BUS is not set
CONFIG_LOCK_KERNEL=y
-CONFIG_USB_KAWETH=m
# CONFIG_SPARC64_PAGE_SIZE_4MB is not set
# CONFIG_SCSI_IZIP_EPP16 is not set
# CONFIG_I2C_STUB is not set
@@ -128,7 +127,6 @@
# CONFIG_USB_USS720 is not set
CONFIG_SND_ALI5451=m
CONFIG_CDROM_PKTCDVD=m
-CONFIG_USB_CATC=m
CONFIG_MEGARAID_MM=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -204,7 +202,6 @@
# CONFIG_CPU_FREQ is not set
# CONFIG_VIDEO_DPC is not set
# CONFIG_8139TOO_PIO is not set
-# CONFIG_USB_RTL8150 is not set
CONFIG_BLK_DEV_LOOP=y
CONFIG_SPARC64_PAGE_SIZE_8KB=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -336,7 +333,6 @@
CONFIG_SCSI_DMX3191D=m
# CONFIG_TULIP_MMIO is not set
CONFIG_USB_LED=m
-CONFIG_USB_PEGASUS=m
# CONFIG_SENSORS_LM77 is not set
CONFIG_USB_STORAGE_DPCM=y
# CONFIG_USB_LEGOTOWER is not set
More information about the Kernel-svn-changes
mailing list