remove incomplete union mounts / jffs2 patches. will be replaced by updated versions...

[openwrt.git] / target / linux / brcm-2.4 / config-default

diff --git a/target/linux/brcm-2.4/config-default b/target/linux/brcm-2.4/config-default
index 390a7d1..263e079 100644 (file)
--- a/target/linux/brcm-2.4/config-default
+++ b/target/linux/brcm-2.4/config-default
@@ -1,24 +1,24 @@
 # CONFIG_60XX_WDT is not set
 # CONFIG_6PACK is not set
 # CONFIG_8139CP is not set
 # CONFIG_60XX_WDT is not set
 # CONFIG_6PACK is not set
 # CONFIG_8139CP is not set

-# CONFIG_8139TOO is not set
+# CONFIG_8139_OLD_RX_RESET is not set

 # CONFIG_8139TOO_8129 is not set
 # CONFIG_8139TOO_8129 is not set

+# CONFIG_8139TOO is not set

 # CONFIG_8139TOO_PIO is not set
 # CONFIG_8139TOO_TUNE_TWISTER is not set
 # CONFIG_8139TOO_PIO is not set
 # CONFIG_8139TOO_TUNE_TWISTER is not set

-# CONFIG_8139_OLD_RX_RESET is not set

 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_ADAPTEC_STARFIRE is not set
 # CONFIG_ADVANTECH_WDT is not set
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_ADAPTEC_STARFIRE is not set
 # CONFIG_ADVANTECH_WDT is not set

-# CONFIG_AIRO is not set

 # CONFIG_AIRO_CS is not set
 # CONFIG_AIRO_CS is not set

+# CONFIG_AIRO is not set

 # CONFIG_ALIM1535_WDT is not set
 # CONFIG_ALIM7101_WDT is not set
 # CONFIG_AMD74XX_OVERRIDE is not set
 # CONFIG_AMD8111_ETH is not set
 # CONFIG_APRICOT is not set
 # CONFIG_ATM is not set
 # CONFIG_ALIM1535_WDT is not set
 # CONFIG_ALIM7101_WDT is not set
 # CONFIG_AMD74XX_OVERRIDE is not set
 # CONFIG_AMD8111_ETH is not set
 # CONFIG_APRICOT is not set
 # CONFIG_ATM is not set

-CONFIG_AX25=m

 # CONFIG_AX25_DAMA_SLAVE is not set
 # CONFIG_AX25_DAMA_SLAVE is not set

+CONFIG_AX25=m

 CONFIG_B44=y
 # CONFIG_BAYCOM_EPP is not set
 # CONFIG_BAYCOM_PAR is not set
 CONFIG_B44=y
 # CONFIG_BAYCOM_EPP is not set
 # CONFIG_BAYCOM_PAR is not set


@@ -34,14 +34,14 @@ CONFIG_BCM947XX=y
 CONFIG_BLK_DEV_AEC62XX=m
 # CONFIG_BLK_DEV_ALI15X3 is not set
 # CONFIG_BLK_DEV_AMD74XX is not set
 CONFIG_BLK_DEV_AEC62XX=m
 # CONFIG_BLK_DEV_ALI15X3 is not set
 # CONFIG_BLK_DEV_AMD74XX is not set

-# CONFIG_BLK_DEV_ATARAID is not set

 # CONFIG_BLK_DEV_ATARAID_HPT is not set
 # CONFIG_BLK_DEV_ATARAID_HPT is not set

+# CONFIG_BLK_DEV_ATARAID is not set

 # CONFIG_BLK_DEV_ATARAID_MEDLEY is not set
 # CONFIG_BLK_DEV_ATARAID_PDC is not set
 # CONFIG_BLK_DEV_ATARAID_SII is not set
 # CONFIG_BLK_DEV_ATIIXP is not set
 # CONFIG_BLK_DEV_ATARAID_MEDLEY is not set
 # CONFIG_BLK_DEV_ATARAID_PDC is not set
 # CONFIG_BLK_DEV_ATARAID_SII is not set
 # CONFIG_BLK_DEV_ATIIXP is not set

-# CONFIG_BLK_DEV_CMD640 is not set

 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set

+# CONFIG_BLK_DEV_CMD640 is not set

 # CONFIG_BLK_DEV_CMD64X is not set
 # CONFIG_BLK_DEV_CS5530 is not set
 # CONFIG_BLK_DEV_CY82C693 is not set
 # CONFIG_BLK_DEV_CMD64X is not set
 # CONFIG_BLK_DEV_CS5530 is not set
 # CONFIG_BLK_DEV_CY82C693 is not set


@@ -50,25 +50,25 @@ CONFIG_BLK_DEV_AEC62XX=m
 # CONFIG_BLK_DEV_HD_IDE is not set
 # CONFIG_BLK_DEV_HPT34X is not set
 # CONFIG_BLK_DEV_HPT366 is not set
 # CONFIG_BLK_DEV_HD_IDE is not set
 # CONFIG_BLK_DEV_HPT34X is not set
 # CONFIG_BLK_DEV_HPT366 is not set

-CONFIG_BLK_DEV_IDE=m

 # CONFIG_BLK_DEV_IDECD is not set
 # CONFIG_BLK_DEV_IDECS is not set
 CONFIG_BLK_DEV_IDEDISK=m
 # CONFIG_BLK_DEV_IDECD is not set
 # CONFIG_BLK_DEV_IDECS is not set
 CONFIG_BLK_DEV_IDEDISK=m

-CONFIG_BLK_DEV_IDEDMA=y

 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
 CONFIG_BLK_DEV_IDEDMA_PCI=y

+CONFIG_BLK_DEV_IDEDMA=y

 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set

+CONFIG_BLK_DEV_IDE=m

 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_BLK_DEV_IDEPCI=y

+# CONFIG_BLK_DEV_IDE_SATA is not set

 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_BLK_DEV_IDETAPE is not set

-# CONFIG_BLK_DEV_IDE_SATA is not set

 # CONFIG_BLK_DEV_ISAPNP is not set
 # CONFIG_BLK_DEV_NS87415 is not set
 CONFIG_BLK_DEV_OFFBOARD=y
 # CONFIG_BLK_DEV_OPTI621 is not set
 # CONFIG_BLK_DEV_ISAPNP is not set
 # CONFIG_BLK_DEV_NS87415 is not set
 CONFIG_BLK_DEV_OFFBOARD=y
 # CONFIG_BLK_DEV_OPTI621 is not set

-CONFIG_BLK_DEV_PDC202XX=y

 # CONFIG_BLK_DEV_PDC202XX_NEW is not set
 CONFIG_BLK_DEV_PDC202XX_OLD=m
 # CONFIG_BLK_DEV_PDC202XX_NEW is not set
 CONFIG_BLK_DEV_PDC202XX_OLD=m

+CONFIG_BLK_DEV_PDC202XX=y

 # CONFIG_BLK_DEV_PIIX is not set
 # CONFIG_BLK_DEV_RZ1000 is not set
 # CONFIG_BLK_DEV_SC1200 is not set
 # CONFIG_BLK_DEV_PIIX is not set
 # CONFIG_BLK_DEV_RZ1000 is not set
 # CONFIG_BLK_DEV_SC1200 is not set


@@ -79,7 +79,6 @@ CONFIG_BLK_DEV_PDC202XX_OLD=m
 # CONFIG_BLK_DEV_TRIFLEX is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
 # CONFIG_BLK_DEV_TRIFLEX is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set

-CONFIG_BLUEZ=m

 CONFIG_BLUEZ_BNEP=m
 CONFIG_BLUEZ_BNEP_MC_FILTER=y
 CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
 CONFIG_BLUEZ_BNEP=m
 CONFIG_BLUEZ_BNEP_MC_FILTER=y
 CONFIG_BLUEZ_BNEP_PROTO_FILTER=y


@@ -88,40 +87,22 @@ CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
 # CONFIG_BLUEZ_HCIBT3C is not set
 # CONFIG_BLUEZ_HCIBTUART is not set
 # CONFIG_BLUEZ_HCIDTL1 is not set
 # CONFIG_BLUEZ_HCIBT3C is not set
 # CONFIG_BLUEZ_HCIBTUART is not set
 # CONFIG_BLUEZ_HCIDTL1 is not set

-CONFIG_BLUEZ_HCIUART=m
-CONFIG_BLUEZ_HCIUART_BCSP=y

 CONFIG_BLUEZ_HCIUART_BCSP_TXCRC=y
 CONFIG_BLUEZ_HCIUART_BCSP_TXCRC=y

+CONFIG_BLUEZ_HCIUART_BCSP=y

 CONFIG_BLUEZ_HCIUART_H4=y
 CONFIG_BLUEZ_HCIUART_H4=y

+CONFIG_BLUEZ_HCIUART=m

 CONFIG_BLUEZ_HCIUSB=m
 CONFIG_BLUEZ_HCIUSB_SCO=y
 # CONFIG_BLUEZ_HCIVHCI is not set
 CONFIG_BLUEZ_L2CAP=m
 CONFIG_BLUEZ_HCIUSB=m
 CONFIG_BLUEZ_HCIUSB_SCO=y
 # CONFIG_BLUEZ_HCIVHCI is not set
 CONFIG_BLUEZ_L2CAP=m

+CONFIG_BLUEZ=m

 CONFIG_BLUEZ_RFCOMM=m
 CONFIG_BLUEZ_RFCOMM_TTY=y
 CONFIG_BLUEZ_SCO=m
 # CONFIG_BPQETHER is not set
 CONFIG_BLUEZ_RFCOMM=m
 CONFIG_BLUEZ_RFCOMM_TTY=y
 CONFIG_BLUEZ_SCO=m
 # CONFIG_BPQETHER is not set

-# CONFIG_BRIDGE_EBT_802_3 is not set
-# CONFIG_BRIDGE_EBT_AMONG is not set
-# CONFIG_BRIDGE_EBT_ARPF is not set
-# CONFIG_BRIDGE_EBT_ARPREPLY is not set
-# CONFIG_BRIDGE_EBT_BROUTE is not set
-# CONFIG_BRIDGE_EBT_DNAT is not set
-# CONFIG_BRIDGE_EBT_IPF is not set
-# CONFIG_BRIDGE_EBT_LIMIT is not set
-# CONFIG_BRIDGE_EBT_LOG is not set
-# CONFIG_BRIDGE_EBT_MARKF is not set
-# CONFIG_BRIDGE_EBT_MARK_T is not set
-# CONFIG_BRIDGE_EBT_PKTTYPE is not set
-# CONFIG_BRIDGE_EBT_REDIRECT is not set
-# CONFIG_BRIDGE_EBT_SNAT is not set
-# CONFIG_BRIDGE_EBT_STP is not set
-# CONFIG_BRIDGE_EBT_T_FILTER is not set
-# CONFIG_BRIDGE_EBT_T_NAT is not set
-# CONFIG_BRIDGE_EBT_VLANF is not set
-# CONFIG_BRIDGE_NF_EBTABLES is not set

 CONFIG_CARDBUS=y
 CONFIG_CARDBUS=y

-CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd console=ttyS0,115200"

 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_BOOL is not set

+CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd console=ttyS0,115200"

 CONFIG_CRC32=y
 # CONFIG_CS89x0 is not set
 # CONFIG_DE4X5 is not set
 CONFIG_CRC32=y
 # CONFIG_CS89x0 is not set
 # CONFIG_DE4X5 is not set


@@ -142,8 +123,8 @@ CONFIG_HAMRADIO=y
 # CONFIG_HP100 is not set
 # CONFIG_HPT34X_AUTODMA is not set
 # CONFIG_I2C_PARPORT is not set
 # CONFIG_HP100 is not set
 # CONFIG_HPT34X_AUTODMA is not set
 # CONFIG_I2C_PARPORT is not set

-# CONFIG_I2O is not set

 # CONFIG_I2O_BLOCK is not set
 # CONFIG_I2O_BLOCK is not set

+# CONFIG_I2O is not set

 # CONFIG_I2O_LAN is not set
 # CONFIG_I2O_PCI is not set
 # CONFIG_I2O_PROC is not set
 # CONFIG_I2O_LAN is not set
 # CONFIG_I2O_PCI is not set
 # CONFIG_I2O_PROC is not set


@@ -152,7 +133,7 @@ CONFIG_HAMRADIO=y
 # CONFIG_I82092 is not set
 # CONFIG_I82365 is not set
 # CONFIG_IB700_WDT is not set
 # CONFIG_I82092 is not set
 # CONFIG_I82365 is not set
 # CONFIG_IB700_WDT is not set

-CONFIG_IDE=m
+# CONFIG_IDE_CHIPSETS is not set

 # CONFIG_IDEDISK_MULTI_MODE is not set
 CONFIG_IDEDISK_STROKE=y
 CONFIG_IDEDMA_AUTO=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
 CONFIG_IDEDISK_STROKE=y
 CONFIG_IDEDMA_AUTO=y


@@ -160,26 +141,11 @@ CONFIG_IDEDMA_IVB=y
 # CONFIG_IDEDMA_ONLYDISK is not set
 CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_IDEDMA_PCI_WIP is not set
 # CONFIG_IDEDMA_ONLYDISK is not set
 CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_IDEDMA_PCI_WIP is not set

+CONFIG_IDE=m

 # CONFIG_IDEPCI_SHARE_IRQ is not set
 # CONFIG_IDEPCI_SHARE_IRQ is not set

-# CONFIG_IDE_CHIPSETS is not set

 # CONFIG_IDE_TASK_IOCTL is not set
 # CONFIG_IEEE1394 is not set
 # CONFIG_IDE_TASK_IOCTL is not set
 # CONFIG_IEEE1394 is not set

-CONFIG_IP6_NF_MATCH_LIMIT=m
-# CONFIG_IP_NF_MATCH_PHYSDEV is not set
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_NQ=m
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_TAB_BITS=12
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_WRR=m
+# CONFIG_IP_VS is not set

 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_LNE390 is not set
 CONFIG_LOG_BUF_SHIFT=0
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_LNE390 is not set
 CONFIG_LOG_BUF_SHIFT=0


@@ -193,38 +159,38 @@ CONFIG_MIPS_BRCM=y
 CONFIG_MKISS=m
 CONFIG_MSDOS_FS=m
 CONFIG_MTD_BCM947XX=y
 CONFIG_MKISS=m
 CONFIG_MSDOS_FS=m
 CONFIG_MTD_BCM947XX=y

+CONFIG_MTD_CFI_B1=y

 CONFIG_MTD_CFI_SSTSTD=y
 CONFIG_MTD_SFLASH=y
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
 # CONFIG_NE3210 is not set
 CONFIG_MTD_CFI_SSTSTD=y
 CONFIG_MTD_SFLASH=y
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
 # CONFIG_NE3210 is not set

-# CONFIG_NETROM is not set

 CONFIG_NET_PCI=y
 # CONFIG_NET_PCMCIA is not set
 CONFIG_NET_PCI=y
 # CONFIG_NET_PCMCIA is not set

+# CONFIG_NETROM is not set

 CONFIG_NET_SCH_ESFQ=m
 CONFIG_NET_WIRELESS=y
 CONFIG_NEW_IRQ=y
 CONFIG_NEW_TIME_C=y
 CONFIG_NET_SCH_ESFQ=m
 CONFIG_NET_WIRELESS=y
 CONFIG_NEW_IRQ=y
 CONFIG_NEW_TIME_C=y

-CONFIG_NLS=y
-CONFIG_PARPORT=m

 # CONFIG_PARPORT_1284 is not set
 # CONFIG_PARPORT_AMIGA is not set
 # CONFIG_PARPORT_ATARI is not set
 # CONFIG_PARPORT_GSC is not set
 # CONFIG_PARPORT_IP22 is not set
 # CONFIG_PARPORT_1284 is not set
 # CONFIG_PARPORT_AMIGA is not set
 # CONFIG_PARPORT_ATARI is not set
 # CONFIG_PARPORT_GSC is not set
 # CONFIG_PARPORT_IP22 is not set

+CONFIG_PARPORT=m

 # CONFIG_PARPORT_MFC3 is not set
 # CONFIG_PARPORT_OTHER is not set
 # CONFIG_PARPORT_PC is not set
 CONFIG_PARPORT_SPLINK=m
 # CONFIG_PARPORT_SUNBPP is not set
 # CONFIG_PARPORT_MFC3 is not set
 # CONFIG_PARPORT_OTHER is not set
 # CONFIG_PARPORT_PC is not set
 CONFIG_PARPORT_SPLINK=m
 # CONFIG_PARPORT_SUNBPP is not set

-CONFIG_PCI=y

 CONFIG_PCI_AUTO=y
 # CONFIG_PCI_HERMES is not set
 # CONFIG_PCI_NAMES is not set
 # CONFIG_PCI_NEW is not set
 CONFIG_PCI_AUTO=y
 # CONFIG_PCI_HERMES is not set
 # CONFIG_PCI_NAMES is not set
 # CONFIG_PCI_NEW is not set

-CONFIG_PCMCIA=m
+CONFIG_PCI=y

 # CONFIG_PCMCIA_ATMEL is not set
 # CONFIG_PCMCIA_HERMES is not set
 # CONFIG_PCMCIA_ATMEL is not set
 # CONFIG_PCMCIA_HERMES is not set

+CONFIG_PCMCIA=m

 CONFIG_PCMCIA_SERIAL_CS=m
 # CONFIG_PCNET32 is not set
 # CONFIG_PCWATCHDOG is not set
 CONFIG_PCMCIA_SERIAL_CS=m
 # CONFIG_PCNET32 is not set
 # CONFIG_PCWATCHDOG is not set


@@ -252,13 +218,11 @@ CONFIG_PRINTER=m
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_QLOGIC_FC is not set
 # CONFIG_SCSI_QLOGIC_ISP is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_QLOGIC_FC is not set
 # CONFIG_SCSI_QLOGIC_ISP is not set

-# CONFIG_SCSI_SYM53C8XX is not set

 # CONFIG_SCSI_SYM53C8XX_2 is not set
 # CONFIG_SCSI_SYM53C8XX_2 is not set

+# CONFIG_SCSI_SYM53C8XX is not set

 # CONFIG_SCx200_WDT is not set
 # CONFIG_SIS900 is not set
 CONFIG_SOFT_WATCHDOG=m
 # CONFIG_SCx200_WDT is not set
 # CONFIG_SIS900 is not set
 CONFIG_SOFT_WATCHDOG=m

-CONFIG_SOUND=m
-# CONFIG_SOUNDMODEM is not set

 # CONFIG_SOUND_AD1980 is not set
 # CONFIG_SOUND_ALI5455 is not set
 # CONFIG_SOUND_BT878 is not set
 # CONFIG_SOUND_AD1980 is not set
 # CONFIG_SOUND_ALI5455 is not set
 # CONFIG_SOUND_BT878 is not set


@@ -271,8 +235,10 @@ CONFIG_SOUND=m
 # CONFIG_SOUND_FORTE is not set
 # CONFIG_SOUND_FUSION is not set
 # CONFIG_SOUND_ICH is not set
 # CONFIG_SOUND_FORTE is not set
 # CONFIG_SOUND_FUSION is not set
 # CONFIG_SOUND_ICH is not set

-# CONFIG_SOUND_MAESTRO is not set
+CONFIG_SOUND=m

 # CONFIG_SOUND_MAESTRO3 is not set
 # CONFIG_SOUND_MAESTRO3 is not set

+# CONFIG_SOUND_MAESTRO is not set
+# CONFIG_SOUNDMODEM is not set

 # CONFIG_SOUND_MSNDCLAS is not set
 # CONFIG_SOUND_MSNDPIN is not set
 # CONFIG_SOUND_OSS is not set
 # CONFIG_SOUND_MSNDCLAS is not set
 # CONFIG_SOUND_MSNDPIN is not set
 # CONFIG_SOUND_OSS is not set


@@ -291,7 +257,6 @@ CONFIG_SOUND=m
 # CONFIG_TMD_HERMES is not set
 # CONFIG_TULIP is not set
 # CONFIG_TUNER_3036 is not set
 # CONFIG_TMD_HERMES is not set
 # CONFIG_TULIP is not set
 # CONFIG_TUNER_3036 is not set

-CONFIG_USB=m

 CONFIG_USB_ACM=m
 # CONFIG_USB_AIPTEK is not set
 CONFIG_USB_AUDIO=m
 CONFIG_USB_ACM=m
 # CONFIG_USB_AIPTEK is not set
 CONFIG_USB_AUDIO=m


@@ -307,9 +272,9 @@ CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_DSBR is not set
 CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_EMI26 is not set
 # CONFIG_USB_DSBR is not set
 CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_EMI26 is not set

-# CONFIG_USB_HID is not set

 # CONFIG_USB_HIDDEV is not set
 # CONFIG_USB_HIDINPUT is not set
 # CONFIG_USB_HIDDEV is not set
 # CONFIG_USB_HIDINPUT is not set

+# CONFIG_USB_HID is not set

 # CONFIG_USB_HPUSBSCSI is not set
 # CONFIG_USB_IBMCAM is not set
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_HPUSBSCSI is not set
 # CONFIG_USB_IBMCAM is not set
 # CONFIG_USB_KAWETH is not set


@@ -317,6 +282,7 @@ CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_KBTAB is not set
 # CONFIG_USB_KONICAWC is not set
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_KBTAB is not set
 # CONFIG_USB_KONICAWC is not set
 # CONFIG_USB_LCD is not set

+CONFIG_USB=m

 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_MIDI is not set
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_MIDI is not set


@@ -331,7 +297,6 @@ CONFIG_USB_PWC=m
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_SCANNER is not set
 # CONFIG_USB_SE401 is not set
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_SCANNER is not set
 # CONFIG_USB_SE401 is not set

-CONFIG_USB_SERIAL=m

 CONFIG_USB_SERIAL_BELKIN=m
 # CONFIG_USB_SERIAL_CYBERJACK is not set
 # CONFIG_USB_SERIAL_DEBUG is not set
 CONFIG_USB_SERIAL_BELKIN=m
 # CONFIG_USB_SERIAL_CYBERJACK is not set
 # CONFIG_USB_SERIAL_DEBUG is not set


@@ -347,25 +312,26 @@ CONFIG_USB_SERIAL_KEYSPAN=m
 CONFIG_USB_SERIAL_KEYSPAN_MPR=y
 # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
 CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
 CONFIG_USB_SERIAL_KEYSPAN_MPR=y
 # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
 CONFIG_USB_SERIAL_KEYSPAN_USA18X=y

-CONFIG_USB_SERIAL_KEYSPAN_USA19=y

 CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19W=y

-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y

 CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
 CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
 CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
 CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y

-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y

 CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y

+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y

 # CONFIG_USB_SERIAL_KLSI is not set
 # CONFIG_USB_SERIAL_KOBIL_SCT is not set
 # CONFIG_USB_SERIAL_KLSI is not set
 # CONFIG_USB_SERIAL_KOBIL_SCT is not set

+CONFIG_USB_SERIAL=m

 CONFIG_USB_SERIAL_MCT_U232=m
 # CONFIG_USB_SERIAL_OMNINET is not set
 CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_MCT_U232=m
 # CONFIG_USB_SERIAL_OMNINET is not set
 CONFIG_USB_SERIAL_PL2303=m

+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set

 CONFIG_USB_SERIAL_VISOR=m
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 # CONFIG_USB_SERIAL_XIRCOM is not set
 CONFIG_USB_SERIAL_VISOR=m
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 # CONFIG_USB_SERIAL_XIRCOM is not set

-CONFIG_USB_STORAGE=m

 CONFIG_USB_STORAGE_DATAFAB=y
 # CONFIG_USB_STORAGE_DEBUG is not set
 CONFIG_USB_STORAGE_DPCM=y
 CONFIG_USB_STORAGE_DATAFAB=y
 # CONFIG_USB_STORAGE_DEBUG is not set
 CONFIG_USB_STORAGE_DPCM=y


@@ -373,12 +339,13 @@ CONFIG_USB_STORAGE_FREECOM=y
 CONFIG_USB_STORAGE_HP8200e=y
 # CONFIG_USB_STORAGE_ISD200 is not set
 CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_STORAGE_HP8200e=y
 # CONFIG_USB_STORAGE_ISD200 is not set
 CONFIG_USB_STORAGE_JUMPSHOT=y

+CONFIG_USB_STORAGE=m

 CONFIG_USB_STORAGE_SDDR09=y
 CONFIG_USB_STORAGE_SDDR55=y
 # CONFIG_USB_STV680 is not set
 # CONFIG_USB_TIGL is not set
 CONFIG_USB_STORAGE_SDDR09=y
 CONFIG_USB_STORAGE_SDDR55=y
 # CONFIG_USB_STV680 is not set
 # CONFIG_USB_TIGL is not set

-CONFIG_USB_UHCI=m

 CONFIG_USB_UHCI_ALT=m
 CONFIG_USB_UHCI_ALT=m

+CONFIG_USB_UHCI=m

 # CONFIG_USB_USS720 is not set
 # CONFIG_USB_VICAM is not set
 # CONFIG_USB_W9968CF is not set
 # CONFIG_USB_USS720 is not set
 # CONFIG_USB_VICAM is not set
 # CONFIG_USB_W9968CF is not set


@@ -395,9 +362,9 @@ CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_PROC_FS=y
 # CONFIG_VIDEO_SAA5249 is not set
 # CONFIG_VIDEO_STRADIS is not set
 CONFIG_VIDEO_PROC_FS=y
 # CONFIG_VIDEO_SAA5249 is not set
 # CONFIG_VIDEO_STRADIS is not set

-# CONFIG_VIDEO_ZORAN is not set

 # CONFIG_VIDEO_ZORAN_BUZ is not set
 # CONFIG_VIDEO_ZORAN_DC10 is not set
 # CONFIG_VIDEO_ZORAN_BUZ is not set
 # CONFIG_VIDEO_ZORAN_DC10 is not set

+# CONFIG_VIDEO_ZORAN is not set

 # CONFIG_VIDEO_ZORAN_LML33 is not set
 # CONFIG_VIDEO_ZR36120 is not set
 # CONFIG_W83877F_WDT is not set
 # CONFIG_VIDEO_ZORAN_LML33 is not set
 # CONFIG_VIDEO_ZR36120 is not set
 # CONFIG_W83877F_WDT is not set