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
This commit is contained in:
parent
6ab5734649
commit
ae9b856f03
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
#
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
#
|
||||
|
|
|
@ -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
|
||||
|
||||
#
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
#
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue