- final update for 2.2.19.

Changed files:
    kernel-i386-BOOT.config -> 1.32
    kernel-i386-smp.config -> 1.15
    kernel-i386.config -> 1.38
    kernel-i586-smp.config -> 1.34
    kernel-i586.config -> 1.36
    kernel-i686-smp.config -> 1.38
    kernel-i686.config -> 1.41

diff --git a/kernel-i386-BOOT.config b/kernel-i386-BOOT.config
index a66308615755d7fce198837b73b3bc159e9f8fb3..4d1367cbf9147a6ba570ed870faf57d4eafe5d2e 100644 (file)
--- a/kernel-i386-BOOT.config
+++ b/kernel-i386-BOOT.config
@@ -96,7 +96,7 @@ CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
 # CONFIG_IDEDISK_STROKE is not set
 CONFIG_BLK_DEV_IDECD=y
-CONFIG_BLK_DEV_IDETAPE=m
+# CONFIG_BLK_DEV_IDETAPE is not set
 CONFIG_BLK_DEV_IDEFLOPPY=m
 CONFIG_BLK_DEV_IDESCSI=m
 # CONFIG_IDE_TASK_IOCTL is not set
@@ -135,7 +135,7 @@ CONFIG_MD_LINEAR=m
 CONFIG_MD_STRIPED=m
 CONFIG_MD_MIRRORING=m
 CONFIG_MD_RAID5=m
-CONFIG_MD_TRANSLUCENT=y
+# CONFIG_MD_TRANSLUCENT is not set
 # CONFIG_MD_HSM is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
@@ -239,6 +239,7 @@ CONFIG_PHONE_IXJ=m
 CONFIG_SCSI=m
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_CHR_DEV_SG=m
@@ -256,10 +257,10 @@ CONFIG_SCSI_AHA152X=m
 CONFIG_SCSI_AHA1542=m
 CONFIG_SCSI_AHA1740=m
 CONFIG_SCSI_AIC7XXX=m
-# CONFIG_AIC7XXX_TCQ_ON_BY_DEFAULT is not set
 CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
-# CONFIG_AIC7XXX_PROC_STATS is not set
-CONFIG_AIC7XXX_RESET_DELAY=5
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_IN2000=m
@@ -310,7 +311,6 @@ CONFIG_SCSI_QLOGIC_FAS=m
 CONFIG_SCSI_QLOGIC_ISP=m
 CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_SEAGATE=m
-CONFIG_SCSI_DC395x_TRMS1040=m
 CONFIG_SCSI_DC390T=m
 # CONFIG_SCSI_DC390T_NOGENSUPP is not set
 CONFIG_SCSI_T128=m
@@ -386,6 +386,8 @@ CONFIG_NI52=m
 CONFIG_NI65=m
 CONFIG_RTL8139=m
 CONFIG_RTL8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
 CONFIG_NET_ISA=y
 CONFIG_AT1700=m
 CONFIG_E2100=m
@@ -403,8 +405,10 @@ CONFIG_SEEQ8005=m
 CONFIG_SK_G16=y
 CONFIG_NET_EISA=y
 CONFIG_PCNET32=m
+CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_AC3200=m
 CONFIG_APRICOT=m
+CONFIG_LP486E=m
 CONFIG_CS89x0=m
 CONFIG_DM9102=m
 CONFIG_DE4X5=m
@@ -544,6 +548,7 @@ CONFIG_ISDN=m
 CONFIG_ISDN_PPP=y
 CONFIG_ISDN_PPP_VJ=y
 CONFIG_ISDN_MPP=y
+CONFIG_ISDN_PPP_BSDCOMP=m
 CONFIG_ISDN_AUDIO=y
 # CONFIG_ISDN_TTY_FAX is not set
 
@@ -551,7 +556,7 @@ CONFIG_ISDN_AUDIO=y
 # ISDN feature submodules
 #
 CONFIG_ISDN_DRV_LOOP=m
-CONFIG_ISDN_DIVERSION=y
+CONFIG_ISDN_DIVERSION=m
 
 #
 # Passive ISDN cards
@@ -563,6 +568,7 @@ CONFIG_DE_AOC=y
 # CONFIG_HISAX_NO_LLC is not set
 # CONFIG_HISAX_NO_KEYPAD is not set
 CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
 CONFIG_HISAX_16_0=y
 CONFIG_HISAX_16_3=y
 CONFIG_HISAX_TELESPCI=y
@@ -580,6 +586,7 @@ CONFIG_HISAX_SEDLBAUER=y
 CONFIG_HISAX_SPORTSTER=y
 CONFIG_HISAX_MIC=y
 CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
 CONFIG_HISAX_NICCY=y
 CONFIG_HISAX_ISURF=y
 CONFIG_HISAX_HSTSAPHIR=y
@@ -598,16 +605,26 @@ CONFIG_ISDN_DRV_PCBIT=m
 CONFIG_ISDN_DRV_SC=m
 CONFIG_ISDN_DRV_ACT2000=m
 CONFIG_ISDN_DRV_EICON=m
+CONFIG_ISDN_DRV_EICON_DIVAS=m
+CONFIG_ISDN_DRV_EICON_OLD=m
+CONFIG_ISDN_DRV_EICON_PCI=y
 CONFIG_ISDN_DRV_EICON_ISA=y
-CONFIG_ISDN_DRV_AVMB1=m
-CONFIG_ISDN_DRV_AVMB1_B1ISA=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=y
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_T1ISA=y
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=y
-CONFIG_ISDN_DRV_AVMB1_T1PCI=y
-CONFIG_ISDN_DRV_AVMB1_C4=y
+CONFIG_ISDN_CAPI=m
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
+CONFIG_ISDN_DRV_AVMB1_B1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_T1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
 
 #
 # Old CD-ROM drivers (not SCSI, not IDE)
@@ -714,21 +731,51 @@ CONFIG_VIDEO_BUZ=m
 CONFIG_USB=m
 CONFIG_USB_DEBUG=y
 CONFIG_USB_DEVICEFS=y
-CONFIG_HOTPLUG=y
 CONFIG_USB_BANDWIDTH=y
 CONFIG_USB_UHCI=m
 CONFIG_USB_UHCI_ALT=m
 CONFIG_USB_OHCI=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_SCANNER=m
 CONFIG_USB_AUDIO=m
+CONFIG_USB_BLUETOOTH=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_STORAGE_DEBUG=y
 CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_HID=m
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_INPUT_KEYBDEV=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_USB_WMFORCE=m
+CONFIG_USB_WACOM=m
+CONFIG_INPUT_EVDEV=m
+CONFIG_USB_DC2XX=m
+CONFIG_USB_MDC800=m
+CONFIG_USB_SCANNER=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_OV511=m
+CONFIG_USB_DSBR=m
+CONFIG_USB_DABUSB=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PLUSB=m
+CONFIG_USB_PEGASUS=m
+
+#
+# USB Serial Converter support
+#
 CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_DEBUG=y
 CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KEYSPAN=m
 CONFIG_USB_SERIAL_KEYSPAN_USA28=y
@@ -736,39 +783,17 @@ CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19=y
 CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
 CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_DEBUG=y
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_OV511=m
-CONFIG_USB_DC2XX=m
-CONFIG_USB_MDC800=m
-CONFIG_USB_STORAGE=m
-CONFIG_USB_STORAGE_DEBUG=y
-CONFIG_USB_DABUSB=m
-CONFIG_USB_PLUSB=m
-CONFIG_USB_PEGASUS=m
 CONFIG_USB_RIO500=m
-CONFIG_USB_DSBR=m
-CONFIG_USB_BLUETOOTH=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_HID=m
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-CONFIG_USB_WACOM=m
-CONFIG_USB_WMFORCE=m
-CONFIG_INPUT_KEYBDEV=m
-CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
 
 #
 # Filesystems
 #
 # CONFIG_QUOTA is not set
 CONFIG_AUTOFS_FS=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
 CONFIG_ADFS_FS=m
 CONFIG_AFFS_FS=m
 CONFIG_HFS_FS=m
@@ -793,8 +818,6 @@ CONFIG_EXT2_FS=y
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 CONFIG_UFS_FS_WRITE=y
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
 CONFIG_EFS_FS=m
 CONFIG_SGI_PARTITION=y
 
@@ -828,6 +851,7 @@ CONFIG_NCPFS_EXTRAS=y
 #
 CONFIG_BSD_DISKLABEL=y
 # CONFIG_MAC_PARTITION is not set
+CONFIG_MINIX_SUBPARTITION=y
 # CONFIG_SMD_DISKLABEL is not set
 CONFIG_SOLARIS_X86_PARTITION=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
@@ -870,6 +894,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_ISO8859_14 is not set
 # CONFIG_NLS_ISO8859_15 is not set
 # CONFIG_NLS_KOI8_R is not set
+CONFIG_NLS_KOI8_RU=m
 
 #
 # Console drivers
@@ -930,6 +955,7 @@ CONFIG_SOUND_EMU10K1=m
 CONFIG_SOUND_ES1370=m
 CONFIG_SOUND_ES1371=m
 CONFIG_SOUND_MAESTRO=m
+CONFIG_SOUND_MAESTRO3=m
 CONFIG_SOUND_ESSSOLO1=m
 CONFIG_SOUND_ICH=m
 CONFIG_SOUND_SONICVIBES=m
@@ -969,7 +995,8 @@ CONFIG_SOUND_YM3812=m
 CONFIG_SOUND_VMIDI=m
 CONFIG_SOUND_UART6850=m
 CONFIG_SOUND_NM256=m
-CONFIG_SOUND_YMPCI=m
+CONFIG_SOUND_YMFPCI=m
+CONFIG_SOUND_YMFPCI_LEGACY=y
 
 #
 # Additional low level sound drivers

diff --git a/kernel-i386-smp.config b/kernel-i386-smp.config
index 4ec6acf65aa6502f381c933f4073d0899bca3a9d..151fe709ec56fa31d332b6a99ca653c8461f19cd 100644 (file)
--- a/kernel-i386-smp.config
+++ b/kernel-i386-smp.config
@@ -20,7 +20,7 @@ CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 CONFIG_1GB=y
 # CONFIG_2GB is not set
-# CONFIG_MATH_EMULATION is not set
+CONFIG_MATH_EMULATION=y
 CONFIG_MTRR=y
 CONFIG_SMP=y
 
@@ -122,22 +122,23 @@ CONFIG_BLK_DEV_IDEDMA=y
 CONFIG_IDEDMA_PCI_EXPERIMENTAL=y
 # CONFIG_IDEDMA_PCI_WIP is not set
 # CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
+CONFIG_BLK_DEV_AEC62XX=y
+CONFIG_BLK_DEV_ALI15X3=y
+CONFIG_BLK_DEV_AMD74XX=y
+CONFIG_BLK_DEV_CMD64X=y
+CONFIG_BLK_DEV_CY82C693=y
 CONFIG_BLK_DEV_CS5530=y
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_PDC202XX is not set
-# CONFIG_BLK_DEV_SIS5513 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_OSB4 is not set
+CONFIG_BLK_DEV_HPT34X=y
+CONFIG_BLK_DEV_HPT366=y
+CONFIG_BLK_DEV_PIIX=y
+CONFIG_BLK_DEV_OPTI621=y
+CONFIG_BLK_DEV_PDC202XX=y
+CONFIG_PDC202XX_BURST=y
+CONFIG_BLK_DEV_SIS5513=y
+CONFIG_BLK_DEV_SLC90E66=y
+CONFIG_BLK_DEV_OSB4=y
 CONFIG_BLK_DEV_TRM290=y
-# CONFIG_BLK_DEV_VIA82CXXX is not set
+CONFIG_BLK_DEV_VIA82CXXX=y
 # CONFIG_IDE_CHIPSETS is not set
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_BLK_DEV_LOOP=m
@@ -153,7 +154,7 @@ CONFIG_MD_LINEAR=m
 CONFIG_MD_STRIPED=m
 CONFIG_MD_MIRRORING=m
 CONFIG_MD_RAID5=m
-CONFIG_MD_TRANSLUCENT=y
+# CONFIG_MD_TRANSLUCENT is not set
 # CONFIG_MD_HSM is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
@@ -314,6 +315,7 @@ CONFIG_PHONE_IXJ=m
 CONFIG_SCSI=m
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
@@ -331,10 +333,10 @@ CONFIG_SCSI_AHA152X=m
 CONFIG_SCSI_AHA1542=m
 CONFIG_SCSI_AHA1740=m
 CONFIG_SCSI_AIC7XXX=m
-# CONFIG_AIC7XXX_TCQ_ON_BY_DEFAULT is not set
 CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
-CONFIG_AIC7XXX_PROC_STATS=y
-CONFIG_AIC7XXX_RESET_DELAY=5
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_IN2000=m
@@ -385,7 +387,6 @@ CONFIG_SCSI_QLOGIC_FAS=m
 CONFIG_SCSI_QLOGIC_ISP=m
 CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_SEAGATE=m
-CONFIG_SCSI_DC395x_TRMS1040=m
 CONFIG_SCSI_DC390T=m
 # CONFIG_SCSI_DC390T_NOGENSUPP is not set
 CONFIG_SCSI_T128=m
@@ -461,6 +462,8 @@ CONFIG_NI52=m
 CONFIG_NI65=m
 CONFIG_RTL8139=m
 CONFIG_RTL8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
 CONFIG_NET_ISA=y
 CONFIG_AT1700=m
 CONFIG_E2100=m
@@ -478,8 +481,10 @@ CONFIG_SEEQ8005=m
 CONFIG_SK_G16=y
 CONFIG_NET_EISA=y
 CONFIG_PCNET32=m
+CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_AC3200=m
 CONFIG_APRICOT=m
+CONFIG_LP486E=m
 CONFIG_CS89x0=m
 CONFIG_DM9102=m
 CONFIG_DE4X5=m
@@ -643,6 +648,7 @@ CONFIG_ISDN=m
 CONFIG_ISDN_PPP=y
 CONFIG_ISDN_PPP_VJ=y
 CONFIG_ISDN_MPP=y
+CONFIG_ISDN_PPP_BSDCOMP=m
 CONFIG_ISDN_AUDIO=y
 # CONFIG_ISDN_TTY_FAX is not set
 # CONFIG_ISDN_X25 is not set
@@ -663,6 +669,7 @@ CONFIG_DE_AOC=y
 # CONFIG_HISAX_NO_LLC is not set
 # CONFIG_HISAX_NO_KEYPAD is not set
 CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
 CONFIG_HISAX_16_0=y
 CONFIG_HISAX_16_3=y
 CONFIG_HISAX_TELESPCI=y
@@ -680,6 +687,7 @@ CONFIG_HISAX_SEDLBAUER=y
 CONFIG_HISAX_SPORTSTER=y
 CONFIG_HISAX_MIC=y
 CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
 CONFIG_HISAX_NICCY=y
 CONFIG_HISAX_ISURF=y
 CONFIG_HISAX_HSTSAPHIR=y
@@ -697,16 +705,27 @@ CONFIG_ISDN_DRV_ICN=m
 CONFIG_ISDN_DRV_PCBIT=m
 CONFIG_ISDN_DRV_SC=m
 CONFIG_ISDN_DRV_ACT2000=m
-CONFIG_ISDN_DRV_EICON=m
+CONFIG_ISDN_DRV_EICON=y
+CONFIG_ISDN_DRV_EICON_DIVAS=m
+CONFIG_ISDN_DRV_EICON_OLD=m
+CONFIG_ISDN_DRV_EICON_PCI=y
 # CONFIG_ISDN_DRV_EICON_ISA is not set
-CONFIG_ISDN_DRV_AVMB1=m
+CONFIG_ISDN_CAPI=m
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
 # CONFIG_ISDN_DRV_AVMB1_B1ISA is not set
 # CONFIG_ISDN_DRV_AVMB1_B1PCI is not set
+# CONFIG_ISDN_DRV_AVMB1_B1PCIV4 is not set
 # CONFIG_ISDN_DRV_AVMB1_T1ISA is not set
 # CONFIG_ISDN_DRV_AVMB1_B1PCMCIA is not set
 # CONFIG_ISDN_DRV_AVMB1_T1PCI is not set
-CONFIG_ISDN_DRV_AVMB1_C4=y
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
 
 #
 # Old CD-ROM drivers (not SCSI, not IDE)
@@ -732,7 +751,6 @@ CONFIG_CDU535=m
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_SERIAL=m
-CONFIG_SERIAL_CONSOLE=y
 CONFIG_SERIAL_EXTENDED=y
 CONFIG_SERIAL_MANY_PORTS=y
 CONFIG_SERIAL_SHARE_IRQ=y
@@ -804,29 +822,19 @@ CONFIG_WATCHDOG=y
 # Watchdog Cards
 #
 # CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_PCWATCHDOG=m
+CONFIG_I810_TCO=m
+CONFIG_MIXCOMWD=m
+CONFIG_60XX_WDT=m
+CONFIG_SOFT_WATCHDOG=m
 CONFIG_WDT=m
 CONFIG_WDT_501=y
 CONFIG_WDT_501_FAN=y
 CONFIG_WDTPCI=m
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_PCWATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_60XX_WDT=m
-CONFIG_MIXCOMWD=m
 CONFIG_NVRAM=m
 CONFIG_RTC=y
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_PHILIPSPAR=m
-CONFIG_I2C_ELV=m
-CONFIG_I2C_VELLEMAN=m
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ELEKTOR=m
-CONFIG_I2C_CHARDEV=m
 # CONFIG_INTEL_RNG is not set
 CONFIG_AGP=m
 CONFIG_AGP_INTEL=y
@@ -897,21 +905,51 @@ CONFIG_FT_ALPHA_CLOCK=0
 CONFIG_USB=m
 CONFIG_USB_DEBUG=y
 CONFIG_USB_DEVICEFS=y
-CONFIG_HOTPLUG=y
 CONFIG_USB_BANDWIDTH=y
 CONFIG_USB_UHCI=m
 CONFIG_USB_UHCI_ALT=m
 CONFIG_USB_OHCI=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_SCANNER=m
 CONFIG_USB_AUDIO=m
+CONFIG_USB_BLUETOOTH=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_STORAGE_DEBUG=y
 CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_HID=m
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_INPUT_KEYBDEV=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_USB_WMFORCE=m
+CONFIG_USB_WACOM=m
+CONFIG_INPUT_EVDEV=m
+CONFIG_USB_DC2XX=m
+CONFIG_USB_MDC800=m
+CONFIG_USB_SCANNER=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_OV511=m
+CONFIG_USB_DSBR=m
+CONFIG_USB_DABUSB=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PLUSB=m
+CONFIG_USB_PEGASUS=m
+
+#
+# USB Serial Converter support
+#
 CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_DEBUG=y
 CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KEYSPAN=m
 CONFIG_USB_SERIAL_KEYSPAN_USA28=y
@@ -919,39 +957,17 @@ CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19=y
 CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
 CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_DEBUG=y
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_OV511=m
-CONFIG_USB_DC2XX=m
-CONFIG_USB_MDC800=m
-CONFIG_USB_STORAGE=m
-CONFIG_USB_STORAGE_DEBUG=y
-CONFIG_USB_DABUSB=m
-CONFIG_USB_PLUSB=m
-CONFIG_USB_PEGASUS=m
 CONFIG_USB_RIO500=m
-CONFIG_USB_DSBR=m
-CONFIG_USB_BLUETOOTH=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_HID=m
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-CONFIG_USB_WACOM=m
-CONFIG_USB_WMFORCE=m
-CONFIG_INPUT_KEYBDEV=m
-CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
 
 #
 # Filesystems
 #
 CONFIG_QUOTA=y
 CONFIG_AUTOFS_FS=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
 CONFIG_ADFS_FS=m
 CONFIG_AFFS_FS=m
 CONFIG_HFS_FS=m
@@ -976,8 +992,6 @@ CONFIG_EXT2_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
 CONFIG_EFS_FS=m
 CONFIG_SGI_PARTITION=y
 
@@ -1011,6 +1025,7 @@ CONFIG_NCPFS_EXTRAS=y
 #
 CONFIG_BSD_DISKLABEL=y
 CONFIG_MAC_PARTITION=y
+CONFIG_MINIX_SUBPARTITION=y
 CONFIG_SMD_DISKLABEL=y
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
@@ -1053,6 +1068,7 @@ CONFIG_NLS_ISO8859_9=m
 CONFIG_NLS_ISO8859_14=m
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_RU=m
 
 #
 # Console drivers
@@ -1113,6 +1129,7 @@ CONFIG_SOUND_EMU10K1=m
 CONFIG_SOUND_ES1370=m
 CONFIG_SOUND_ES1371=m
 CONFIG_SOUND_MAESTRO=m
+CONFIG_SOUND_MAESTRO3=m
 CONFIG_SOUND_ESSSOLO1=m
 CONFIG_SOUND_ICH=m
 CONFIG_SOUND_SONICVIBES=m
@@ -1152,7 +1169,8 @@ CONFIG_SOUND_YM3812=m
 CONFIG_SOUND_VMIDI=m
 CONFIG_SOUND_UART6850=m
 CONFIG_SOUND_NM256=m
-CONFIG_SOUND_YMPCI=m
+CONFIG_SOUND_YMFPCI=m
+CONFIG_SOUND_YMFPCI_LEGACY=y
 
 #
 # Additional low level sound drivers

diff --git a/kernel-i386.config b/kernel-i386.config
index 26790c8cb0b0b81f247ca6a2055861d8751b99fe..ca7738eb5fc31fd1901bd5a7e15fe81a6ee13a09 100644 (file)
--- a/kernel-i386.config
+++ b/kernel-i386.config
@@ -20,7 +20,7 @@ CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 CONFIG_1GB=y
 # CONFIG_2GB is not set
-# CONFIG_MATH_EMULATION is not set
+CONFIG_MATH_EMULATION=y
 CONFIG_MTRR=y
 # CONFIG_SMP is not set
 
@@ -131,6 +131,7 @@ CONFIG_BLK_DEV_HPT366=y
 CONFIG_BLK_DEV_PIIX=y
 CONFIG_BLK_DEV_OPTI621=y
 CONFIG_BLK_DEV_PDC202XX=y
+CONFIG_PDC202XX_BURST=y
 CONFIG_BLK_DEV_SIS5513=y
 CONFIG_BLK_DEV_SLC90E66=y
 CONFIG_BLK_DEV_OSB4=y
@@ -151,7 +152,7 @@ CONFIG_MD_LINEAR=m
 CONFIG_MD_STRIPED=m
 CONFIG_MD_MIRRORING=m
 CONFIG_MD_RAID5=m
-CONFIG_MD_TRANSLUCENT=y
+# CONFIG_MD_TRANSLUCENT is not set
 # CONFIG_MD_HSM is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
@@ -312,6 +313,7 @@ CONFIG_PHONE_IXJ=m
 CONFIG_SCSI=m
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
@@ -329,10 +331,10 @@ CONFIG_SCSI_AHA152X=m
 CONFIG_SCSI_AHA1542=m
 CONFIG_SCSI_AHA1740=m
 CONFIG_SCSI_AIC7XXX=m
-# CONFIG_AIC7XXX_TCQ_ON_BY_DEFAULT is not set
 CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
-CONFIG_AIC7XXX_PROC_STATS=y
-CONFIG_AIC7XXX_RESET_DELAY=5
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_IN2000=m
@@ -383,7 +385,6 @@ CONFIG_SCSI_QLOGIC_FAS=m
 CONFIG_SCSI_QLOGIC_ISP=m
 CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_SEAGATE=m
-CONFIG_SCSI_DC395x_TRMS1040=m
 CONFIG_SCSI_DC390T=m
 # CONFIG_SCSI_DC390T_NOGENSUPP is not set
 CONFIG_SCSI_T128=m
@@ -459,6 +460,8 @@ CONFIG_NI52=m
 CONFIG_NI65=m
 CONFIG_RTL8139=m
 CONFIG_RTL8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
 CONFIG_NET_ISA=y
 CONFIG_AT1700=m
 CONFIG_E2100=m
@@ -476,8 +479,10 @@ CONFIG_SEEQ8005=m
 CONFIG_SK_G16=y
 CONFIG_NET_EISA=y
 CONFIG_PCNET32=m
+CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_AC3200=m
 CONFIG_APRICOT=m
+CONFIG_LP486E=m
 CONFIG_CS89x0=m
 CONFIG_DM9102=m
 CONFIG_DE4X5=m
@@ -641,6 +646,7 @@ CONFIG_ISDN=m
 CONFIG_ISDN_PPP=y
 CONFIG_ISDN_PPP_VJ=y
 CONFIG_ISDN_MPP=y
+CONFIG_ISDN_PPP_BSDCOMP=m
 CONFIG_ISDN_AUDIO=y
 # CONFIG_ISDN_TTY_FAX is not set
 # CONFIG_ISDN_X25 is not set
@@ -661,6 +667,7 @@ CONFIG_DE_AOC=y
 # CONFIG_HISAX_NO_LLC is not set
 # CONFIG_HISAX_NO_KEYPAD is not set
 CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
 CONFIG_HISAX_16_0=y
 CONFIG_HISAX_16_3=y
 CONFIG_HISAX_TELESPCI=y
@@ -678,6 +685,7 @@ CONFIG_HISAX_SEDLBAUER=y
 CONFIG_HISAX_SPORTSTER=y
 CONFIG_HISAX_MIC=y
 CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
 CONFIG_HISAX_NICCY=y
 CONFIG_HISAX_ISURF=y
 CONFIG_HISAX_HSTSAPHIR=y
@@ -695,16 +703,27 @@ CONFIG_ISDN_DRV_ICN=m
 CONFIG_ISDN_DRV_PCBIT=m
 CONFIG_ISDN_DRV_SC=m
 CONFIG_ISDN_DRV_ACT2000=m
-CONFIG_ISDN_DRV_EICON=m
+CONFIG_ISDN_DRV_EICON=y
+CONFIG_ISDN_DRV_EICON_DIVAS=m
+CONFIG_ISDN_DRV_EICON_OLD=m
+CONFIG_ISDN_DRV_EICON_PCI=y
 # CONFIG_ISDN_DRV_EICON_ISA is not set
-CONFIG_ISDN_DRV_AVMB1=m
+CONFIG_ISDN_CAPI=m
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
 # CONFIG_ISDN_DRV_AVMB1_B1ISA is not set
 # CONFIG_ISDN_DRV_AVMB1_B1PCI is not set
+# CONFIG_ISDN_DRV_AVMB1_B1PCIV4 is not set
 # CONFIG_ISDN_DRV_AVMB1_T1ISA is not set
 # CONFIG_ISDN_DRV_AVMB1_B1PCMCIA is not set
 # CONFIG_ISDN_DRV_AVMB1_T1PCI is not set
-CONFIG_ISDN_DRV_AVMB1_C4=y
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
 
 #
 # Old CD-ROM drivers (not SCSI, not IDE)
@@ -730,7 +749,6 @@ CONFIG_CDU535=m
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_SERIAL=m
-CONFIG_SERIAL_CONSOLE=y
 CONFIG_SERIAL_EXTENDED=y
 CONFIG_SERIAL_MANY_PORTS=y
 CONFIG_SERIAL_SHARE_IRQ=y
@@ -802,29 +820,19 @@ CONFIG_WATCHDOG=y
 # Watchdog Cards
 #
 # CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_PCWATCHDOG=m
+CONFIG_I810_TCO=m
+CONFIG_MIXCOMWD=m
+CONFIG_60XX_WDT=m
+CONFIG_SOFT_WATCHDOG=m
 CONFIG_WDT=m
 CONFIG_WDT_501=y
 CONFIG_WDT_501_FAN=y
 CONFIG_WDTPCI=m
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_PCWATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_60XX_WDT=m
-CONFIG_MIXCOMWD=m
 CONFIG_NVRAM=m
 CONFIG_RTC=y
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_PHILIPSPAR=m
-CONFIG_I2C_ELV=m
-CONFIG_I2C_VELLEMAN=m
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ELEKTOR=m
-CONFIG_I2C_CHARDEV=m
 # CONFIG_INTEL_RNG is not set
 CONFIG_AGP=m
 CONFIG_AGP_INTEL=y
@@ -895,21 +903,51 @@ CONFIG_FT_ALPHA_CLOCK=0
 CONFIG_USB=m
 CONFIG_USB_DEBUG=y
 CONFIG_USB_DEVICEFS=y
-CONFIG_HOTPLUG=y
 CONFIG_USB_BANDWIDTH=y
 CONFIG_USB_UHCI=m
 CONFIG_USB_UHCI_ALT=m
 CONFIG_USB_OHCI=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_SCANNER=m
 CONFIG_USB_AUDIO=m
+CONFIG_USB_BLUETOOTH=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_STORAGE_DEBUG=y
 CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_HID=m
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_INPUT_KEYBDEV=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_USB_WMFORCE=m
+CONFIG_USB_WACOM=m
+CONFIG_INPUT_EVDEV=m
+CONFIG_USB_DC2XX=m
+CONFIG_USB_MDC800=m
+CONFIG_USB_SCANNER=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_OV511=m
+CONFIG_USB_DSBR=m
+CONFIG_USB_DABUSB=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PLUSB=m
+CONFIG_USB_PEGASUS=m
+
+#
+# USB Serial Converter support
+#
 CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_DEBUG=y
 CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KEYSPAN=m
 CONFIG_USB_SERIAL_KEYSPAN_USA28=y
@@ -917,39 +955,17 @@ CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19=y
 CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
 CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_DEBUG=y
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_OV511=m
-CONFIG_USB_DC2XX=m
-CONFIG_USB_MDC800=m
-CONFIG_USB_STORAGE=m
-CONFIG_USB_STORAGE_DEBUG=y
-CONFIG_USB_DABUSB=m
-CONFIG_USB_PLUSB=m
-CONFIG_USB_PEGASUS=m
 CONFIG_USB_RIO500=m
-CONFIG_USB_DSBR=m
-CONFIG_USB_BLUETOOTH=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_HID=m
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-CONFIG_USB_WACOM=m
-CONFIG_USB_WMFORCE=m
-CONFIG_INPUT_KEYBDEV=m
-CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
 
 #
 # Filesystems
 #
 CONFIG_QUOTA=y
 CONFIG_AUTOFS_FS=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
 CONFIG_ADFS_FS=m
 CONFIG_AFFS_FS=m
 CONFIG_HFS_FS=m
@@ -974,8 +990,6 @@ CONFIG_EXT2_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
 CONFIG_EFS_FS=m
 CONFIG_SGI_PARTITION=y
 
@@ -1009,6 +1023,7 @@ CONFIG_NCPFS_EXTRAS=y
 #
 CONFIG_BSD_DISKLABEL=y
 CONFIG_MAC_PARTITION=y
+CONFIG_MINIX_SUBPARTITION=y
 CONFIG_SMD_DISKLABEL=y
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
@@ -1051,6 +1066,7 @@ CONFIG_NLS_ISO8859_9=m
 CONFIG_NLS_ISO8859_14=m
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_RU=m
 
 #
 # Console drivers
@@ -1111,6 +1127,7 @@ CONFIG_SOUND_EMU10K1=m
 CONFIG_SOUND_ES1370=m
 CONFIG_SOUND_ES1371=m
 CONFIG_SOUND_MAESTRO=m
+CONFIG_SOUND_MAESTRO3=m
 CONFIG_SOUND_ESSSOLO1=m
 CONFIG_SOUND_ICH=m
 CONFIG_SOUND_SONICVIBES=m
@@ -1150,7 +1167,8 @@ CONFIG_SOUND_YM3812=m
 CONFIG_SOUND_VMIDI=m
 CONFIG_SOUND_UART6850=m
 CONFIG_SOUND_NM256=m
-CONFIG_SOUND_YMPCI=m
+CONFIG_SOUND_YMFPCI=m
+CONFIG_SOUND_YMFPCI_LEGACY=y
 
 #
 # Additional low level sound drivers

diff --git a/kernel-i586-smp.config b/kernel-i586-smp.config
index ca07c4ca0653df920f4dfcfe6d5e1468eb4465f0..35a770e2f5b21c3b7556069b8b3ba786c0231782 100644 (file)
--- a/kernel-i586-smp.config
+++ b/kernel-i586-smp.config
@@ -126,22 +126,23 @@ CONFIG_BLK_DEV_IDEDMA=y
 CONFIG_IDEDMA_PCI_EXPERIMENTAL=y
 # CONFIG_IDEDMA_PCI_WIP is not set
 # CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
+CONFIG_BLK_DEV_AEC62XX=y
+CONFIG_BLK_DEV_ALI15X3=y
+CONFIG_BLK_DEV_AMD74XX=y
+CONFIG_BLK_DEV_CMD64X=y
+CONFIG_BLK_DEV_CY82C693=y
 CONFIG_BLK_DEV_CS5530=y
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_PDC202XX is not set
-# CONFIG_BLK_DEV_SIS5513 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_OSB4 is not set
+CONFIG_BLK_DEV_HPT34X=y
+CONFIG_BLK_DEV_HPT366=y
+CONFIG_BLK_DEV_PIIX=y
+CONFIG_BLK_DEV_OPTI621=y
+CONFIG_BLK_DEV_PDC202XX=y
+CONFIG_PDC202XX_BURST=y
+CONFIG_BLK_DEV_SIS5513=y
+CONFIG_BLK_DEV_SLC90E66=y
+CONFIG_BLK_DEV_OSB4=y
 CONFIG_BLK_DEV_TRM290=y
-# CONFIG_BLK_DEV_VIA82CXXX is not set
+CONFIG_BLK_DEV_VIA82CXXX=y
 # CONFIG_IDE_CHIPSETS is not set
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_BLK_DEV_LOOP=m
@@ -157,7 +158,7 @@ CONFIG_MD_LINEAR=m
 CONFIG_MD_STRIPED=m
 CONFIG_MD_MIRRORING=m
 CONFIG_MD_RAID5=m
-CONFIG_MD_TRANSLUCENT=y
+# CONFIG_MD_TRANSLUCENT is not set
 # CONFIG_MD_HSM is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
@@ -318,6 +319,7 @@ CONFIG_PHONE_IXJ=m
 CONFIG_SCSI=m
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
@@ -335,10 +337,10 @@ CONFIG_SCSI_AHA152X=m
 CONFIG_SCSI_AHA1542=m
 CONFIG_SCSI_AHA1740=m
 CONFIG_SCSI_AIC7XXX=m
-# CONFIG_AIC7XXX_TCQ_ON_BY_DEFAULT is not set
 CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
-CONFIG_AIC7XXX_PROC_STATS=y
-CONFIG_AIC7XXX_RESET_DELAY=5
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_IN2000=m
@@ -389,7 +391,6 @@ CONFIG_SCSI_QLOGIC_FAS=m
 CONFIG_SCSI_QLOGIC_ISP=m
 CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_SEAGATE=m
-CONFIG_SCSI_DC395x_TRMS1040=m
 CONFIG_SCSI_DC390T=m
 # CONFIG_SCSI_DC390T_NOGENSUPP is not set
 CONFIG_SCSI_T128=m
@@ -465,6 +466,8 @@ CONFIG_NI52=m
 CONFIG_NI65=m
 CONFIG_RTL8139=m
 CONFIG_RTL8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
 CONFIG_NET_ISA=y
 CONFIG_AT1700=m
 CONFIG_E2100=m
@@ -482,8 +485,10 @@ CONFIG_SEEQ8005=m
 CONFIG_SK_G16=y
 CONFIG_NET_EISA=y
 CONFIG_PCNET32=m
+CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_AC3200=m
 CONFIG_APRICOT=m
+CONFIG_LP486E=m
 CONFIG_CS89x0=m
 CONFIG_DM9102=m
 CONFIG_DE4X5=m
@@ -647,6 +652,7 @@ CONFIG_ISDN=m
 CONFIG_ISDN_PPP=y
 CONFIG_ISDN_PPP_VJ=y
 CONFIG_ISDN_MPP=y
+CONFIG_ISDN_PPP_BSDCOMP=m
 CONFIG_ISDN_AUDIO=y
 # CONFIG_ISDN_TTY_FAX is not set
 # CONFIG_ISDN_X25 is not set
@@ -667,6 +673,7 @@ CONFIG_DE_AOC=y
 # CONFIG_HISAX_NO_LLC is not set
 # CONFIG_HISAX_NO_KEYPAD is not set
 CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
 CONFIG_HISAX_16_0=y
 CONFIG_HISAX_16_3=y
 CONFIG_HISAX_TELESPCI=y
@@ -684,6 +691,7 @@ CONFIG_HISAX_SEDLBAUER=y
 CONFIG_HISAX_SPORTSTER=y
 CONFIG_HISAX_MIC=y
 CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
 CONFIG_HISAX_NICCY=y
 CONFIG_HISAX_ISURF=y
 CONFIG_HISAX_HSTSAPHIR=y
@@ -701,16 +709,27 @@ CONFIG_ISDN_DRV_ICN=m
 CONFIG_ISDN_DRV_PCBIT=m
 CONFIG_ISDN_DRV_SC=m
 CONFIG_ISDN_DRV_ACT2000=m
-CONFIG_ISDN_DRV_EICON=m
+CONFIG_ISDN_DRV_EICON=y
+CONFIG_ISDN_DRV_EICON_DIVAS=m
+CONFIG_ISDN_DRV_EICON_OLD=m
+CONFIG_ISDN_DRV_EICON_PCI=y
 # CONFIG_ISDN_DRV_EICON_ISA is not set
-CONFIG_ISDN_DRV_AVMB1=m
+CONFIG_ISDN_CAPI=m
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
 # CONFIG_ISDN_DRV_AVMB1_B1ISA is not set
 # CONFIG_ISDN_DRV_AVMB1_B1PCI is not set
+# CONFIG_ISDN_DRV_AVMB1_B1PCIV4 is not set
 # CONFIG_ISDN_DRV_AVMB1_T1ISA is not set
 # CONFIG_ISDN_DRV_AVMB1_B1PCMCIA is not set
 # CONFIG_ISDN_DRV_AVMB1_T1PCI is not set
-CONFIG_ISDN_DRV_AVMB1_C4=y
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
 
 #
 # Old CD-ROM drivers (not SCSI, not IDE)
@@ -736,7 +755,6 @@ CONFIG_CDU535=m
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_SERIAL=m
-CONFIG_SERIAL_CONSOLE=y
 CONFIG_SERIAL_EXTENDED=y
 CONFIG_SERIAL_MANY_PORTS=y
 CONFIG_SERIAL_SHARE_IRQ=y
@@ -808,29 +826,19 @@ CONFIG_WATCHDOG=y
 # Watchdog Cards
 #
 # CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_PCWATCHDOG=m
+CONFIG_I810_TCO=m
+CONFIG_MIXCOMWD=m
+CONFIG_60XX_WDT=m
+CONFIG_SOFT_WATCHDOG=m
 CONFIG_WDT=m
 CONFIG_WDT_501=y
 CONFIG_WDT_501_FAN=y
 CONFIG_WDTPCI=m
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_PCWATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_60XX_WDT=m
-CONFIG_MIXCOMWD=m
 CONFIG_NVRAM=m
 CONFIG_RTC=y
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_PHILIPSPAR=m
-CONFIG_I2C_ELV=m
-CONFIG_I2C_VELLEMAN=m
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ELEKTOR=m
-CONFIG_I2C_CHARDEV=m
 # CONFIG_INTEL_RNG is not set
 CONFIG_AGP=m
 CONFIG_AGP_INTEL=y
@@ -901,21 +909,51 @@ CONFIG_FT_ALPHA_CLOCK=0
 CONFIG_USB=m
 CONFIG_USB_DEBUG=y
 CONFIG_USB_DEVICEFS=y
-CONFIG_HOTPLUG=y
 CONFIG_USB_BANDWIDTH=y
 CONFIG_USB_UHCI=m
 CONFIG_USB_UHCI_ALT=m
 CONFIG_USB_OHCI=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_SCANNER=m
 CONFIG_USB_AUDIO=m
+CONFIG_USB_BLUETOOTH=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_STORAGE_DEBUG=y
 CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_HID=m
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_INPUT_KEYBDEV=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_USB_WMFORCE=m
+CONFIG_USB_WACOM=m
+CONFIG_INPUT_EVDEV=m
+CONFIG_USB_DC2XX=m
+CONFIG_USB_MDC800=m
+CONFIG_USB_SCANNER=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_OV511=m
+CONFIG_USB_DSBR=m
+CONFIG_USB_DABUSB=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PLUSB=m
+CONFIG_USB_PEGASUS=m
+
+#
+# USB Serial Converter support
+#
 CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_DEBUG=y
 CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KEYSPAN=m
 CONFIG_USB_SERIAL_KEYSPAN_USA28=y
@@ -923,39 +961,17 @@ CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19=y
 CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
 CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_DEBUG=y
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_OV511=m
-CONFIG_USB_DC2XX=m
-CONFIG_USB_MDC800=m
-CONFIG_USB_STORAGE=m
-CONFIG_USB_STORAGE_DEBUG=y
-CONFIG_USB_DABUSB=m
-CONFIG_USB_PLUSB=m
-CONFIG_USB_PEGASUS=m
 CONFIG_USB_RIO500=m
-CONFIG_USB_DSBR=m
-CONFIG_USB_BLUETOOTH=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_HID=m
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-CONFIG_USB_WACOM=m
-CONFIG_USB_WMFORCE=m
-CONFIG_INPUT_KEYBDEV=m
-CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
 
 #
 # Filesystems
 #
 CONFIG_QUOTA=y
 CONFIG_AUTOFS_FS=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
 CONFIG_ADFS_FS=m
 CONFIG_AFFS_FS=m
 CONFIG_HFS_FS=m
@@ -980,8 +996,6 @@ CONFIG_EXT2_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
 CONFIG_EFS_FS=m
 CONFIG_SGI_PARTITION=y
 
@@ -1015,6 +1029,7 @@ CONFIG_NCPFS_EXTRAS=y
 #
 CONFIG_BSD_DISKLABEL=y
 CONFIG_MAC_PARTITION=y
+CONFIG_MINIX_SUBPARTITION=y
 CONFIG_SMD_DISKLABEL=y
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
@@ -1057,6 +1072,7 @@ CONFIG_NLS_ISO8859_9=m
 CONFIG_NLS_ISO8859_14=m
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_RU=m
 
 #
 # Console drivers
@@ -1117,6 +1133,7 @@ CONFIG_SOUND_EMU10K1=m
 CONFIG_SOUND_ES1370=m
 CONFIG_SOUND_ES1371=m
 CONFIG_SOUND_MAESTRO=m
+CONFIG_SOUND_MAESTRO3=m
 CONFIG_SOUND_ESSSOLO1=m
 CONFIG_SOUND_ICH=m
 CONFIG_SOUND_SONICVIBES=m
@@ -1156,7 +1173,8 @@ CONFIG_SOUND_YM3812=m
 CONFIG_SOUND_VMIDI=m
 CONFIG_SOUND_UART6850=m
 CONFIG_SOUND_NM256=m
-CONFIG_SOUND_YMPCI=m
+CONFIG_SOUND_YMFPCI=m
+CONFIG_SOUND_YMFPCI_LEGACY=y
 
 #
 # Additional low level sound drivers

diff --git a/kernel-i586.config b/kernel-i586.config
index 6abd122fe44993ca949726eb252bb4f9c5fa8f42..427b9fdfebaa7623030d4fd85ea49923bd3b3ed3 100644 (file)
--- a/kernel-i586.config
+++ b/kernel-i586.config
@@ -135,6 +135,7 @@ CONFIG_BLK_DEV_HPT366=y
 CONFIG_BLK_DEV_PIIX=y
 CONFIG_BLK_DEV_OPTI621=y
 CONFIG_BLK_DEV_PDC202XX=y
+CONFIG_PDC202XX_BURST=y
 CONFIG_BLK_DEV_SIS5513=y
 CONFIG_BLK_DEV_SLC90E66=y
 CONFIG_BLK_DEV_OSB4=y
@@ -155,7 +156,7 @@ CONFIG_MD_LINEAR=m
 CONFIG_MD_STRIPED=m
 CONFIG_MD_MIRRORING=m
 CONFIG_MD_RAID5=m
-CONFIG_MD_TRANSLUCENT=y
+# CONFIG_MD_TRANSLUCENT is not set
 # CONFIG_MD_HSM is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
@@ -316,6 +317,7 @@ CONFIG_PHONE_IXJ=m
 CONFIG_SCSI=m
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
@@ -333,10 +335,10 @@ CONFIG_SCSI_AHA152X=m
 CONFIG_SCSI_AHA1542=m
 CONFIG_SCSI_AHA1740=m
 CONFIG_SCSI_AIC7XXX=m
-# CONFIG_AIC7XXX_TCQ_ON_BY_DEFAULT is not set
 CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
-CONFIG_AIC7XXX_PROC_STATS=y
-CONFIG_AIC7XXX_RESET_DELAY=5
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_IN2000=m
@@ -387,7 +389,6 @@ CONFIG_SCSI_QLOGIC_FAS=m
 CONFIG_SCSI_QLOGIC_ISP=m
 CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_SEAGATE=m
-CONFIG_SCSI_DC395x_TRMS1040=m
 CONFIG_SCSI_DC390T=m
 # CONFIG_SCSI_DC390T_NOGENSUPP is not set
 CONFIG_SCSI_T128=m
@@ -463,6 +464,8 @@ CONFIG_NI52=m
 CONFIG_NI65=m
 CONFIG_RTL8139=m
 CONFIG_RTL8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
 CONFIG_NET_ISA=y
 CONFIG_AT1700=m
 CONFIG_E2100=m
@@ -480,8 +483,10 @@ CONFIG_SEEQ8005=m
 CONFIG_SK_G16=y
 CONFIG_NET_EISA=y
 CONFIG_PCNET32=m
+CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_AC3200=m
 CONFIG_APRICOT=m
+CONFIG_LP486E=m
 CONFIG_CS89x0=m
 CONFIG_DM9102=m
 CONFIG_DE4X5=m
@@ -645,6 +650,7 @@ CONFIG_ISDN=m
 CONFIG_ISDN_PPP=y
 CONFIG_ISDN_PPP_VJ=y
 CONFIG_ISDN_MPP=y
+CONFIG_ISDN_PPP_BSDCOMP=m
 CONFIG_ISDN_AUDIO=y
 # CONFIG_ISDN_TTY_FAX is not set
 # CONFIG_ISDN_X25 is not set
@@ -665,6 +671,7 @@ CONFIG_DE_AOC=y
 # CONFIG_HISAX_NO_LLC is not set
 # CONFIG_HISAX_NO_KEYPAD is not set
 CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
 CONFIG_HISAX_16_0=y
 CONFIG_HISAX_16_3=y
 CONFIG_HISAX_TELESPCI=y
@@ -682,6 +689,7 @@ CONFIG_HISAX_SEDLBAUER=y
 CONFIG_HISAX_SPORTSTER=y
 CONFIG_HISAX_MIC=y
 CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
 CONFIG_HISAX_NICCY=y
 CONFIG_HISAX_ISURF=y
 CONFIG_HISAX_HSTSAPHIR=y
@@ -699,16 +707,27 @@ CONFIG_ISDN_DRV_ICN=m
 CONFIG_ISDN_DRV_PCBIT=m
 CONFIG_ISDN_DRV_SC=m
 CONFIG_ISDN_DRV_ACT2000=m
-CONFIG_ISDN_DRV_EICON=m
+CONFIG_ISDN_DRV_EICON=y
+CONFIG_ISDN_DRV_EICON_DIVAS=m
+CONFIG_ISDN_DRV_EICON_OLD=m
+CONFIG_ISDN_DRV_EICON_PCI=y
 # CONFIG_ISDN_DRV_EICON_ISA is not set
-CONFIG_ISDN_DRV_AVMB1=m
+CONFIG_ISDN_CAPI=m
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
 # CONFIG_ISDN_DRV_AVMB1_B1ISA is not set
 # CONFIG_ISDN_DRV_AVMB1_B1PCI is not set
+# CONFIG_ISDN_DRV_AVMB1_B1PCIV4 is not set
 # CONFIG_ISDN_DRV_AVMB1_T1ISA is not set
 # CONFIG_ISDN_DRV_AVMB1_B1PCMCIA is not set
 # CONFIG_ISDN_DRV_AVMB1_T1PCI is not set
-CONFIG_ISDN_DRV_AVMB1_C4=y
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
 
 #
 # Old CD-ROM drivers (not SCSI, not IDE)
@@ -734,7 +753,6 @@ CONFIG_CDU535=m
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_SERIAL=m
-CONFIG_SERIAL_CONSOLE=y
 CONFIG_SERIAL_EXTENDED=y
 CONFIG_SERIAL_MANY_PORTS=y
 CONFIG_SERIAL_SHARE_IRQ=y
@@ -806,29 +824,19 @@ CONFIG_WATCHDOG=y
 # Watchdog Cards
 #
 # CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_PCWATCHDOG=m
+CONFIG_I810_TCO=m
+CONFIG_MIXCOMWD=m
+CONFIG_60XX_WDT=m
+CONFIG_SOFT_WATCHDOG=m
 CONFIG_WDT=m
 CONFIG_WDT_501=y
 CONFIG_WDT_501_FAN=y
 CONFIG_WDTPCI=m
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_PCWATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_60XX_WDT=m
-CONFIG_MIXCOMWD=m
 CONFIG_NVRAM=m
 CONFIG_RTC=y
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_PHILIPSPAR=m
-CONFIG_I2C_ELV=m
-CONFIG_I2C_VELLEMAN=m
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ELEKTOR=m
-CONFIG_I2C_CHARDEV=m
 # CONFIG_INTEL_RNG is not set
 CONFIG_AGP=m
 CONFIG_AGP_INTEL=y
@@ -899,21 +907,51 @@ CONFIG_FT_ALPHA_CLOCK=0
 CONFIG_USB=m
 CONFIG_USB_DEBUG=y
 CONFIG_USB_DEVICEFS=y
-CONFIG_HOTPLUG=y
 CONFIG_USB_BANDWIDTH=y
 CONFIG_USB_UHCI=m
 CONFIG_USB_UHCI_ALT=m
 CONFIG_USB_OHCI=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_SCANNER=m
 CONFIG_USB_AUDIO=m
+CONFIG_USB_BLUETOOTH=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_STORAGE_DEBUG=y
 CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_HID=m
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_INPUT_KEYBDEV=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_USB_WMFORCE=m
+CONFIG_USB_WACOM=m
+CONFIG_INPUT_EVDEV=m
+CONFIG_USB_DC2XX=m
+CONFIG_USB_MDC800=m
+CONFIG_USB_SCANNER=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_OV511=m
+CONFIG_USB_DSBR=m
+CONFIG_USB_DABUSB=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PLUSB=m
+CONFIG_USB_PEGASUS=m
+
+#
+# USB Serial Converter support
+#
 CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_DEBUG=y
 CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KEYSPAN=m
 CONFIG_USB_SERIAL_KEYSPAN_USA28=y
@@ -921,39 +959,17 @@ CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19=y
 CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
 CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_DEBUG=y
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_OV511=m
-CONFIG_USB_DC2XX=m
-CONFIG_USB_MDC800=m
-CONFIG_USB_STORAGE=m
-CONFIG_USB_STORAGE_DEBUG=y
-CONFIG_USB_DABUSB=m
-CONFIG_USB_PLUSB=m
-CONFIG_USB_PEGASUS=m
 CONFIG_USB_RIO500=m
-CONFIG_USB_DSBR=m
-CONFIG_USB_BLUETOOTH=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_HID=m
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-CONFIG_USB_WACOM=m
-CONFIG_USB_WMFORCE=m
-CONFIG_INPUT_KEYBDEV=m
-CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
 
 #
 # Filesystems
 #
 CONFIG_QUOTA=y
 CONFIG_AUTOFS_FS=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
 CONFIG_ADFS_FS=m
 CONFIG_AFFS_FS=m
 CONFIG_HFS_FS=m
@@ -978,8 +994,6 @@ CONFIG_EXT2_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
 CONFIG_EFS_FS=m
 CONFIG_SGI_PARTITION=y
 
@@ -1013,6 +1027,7 @@ CONFIG_NCPFS_EXTRAS=y
 #
 CONFIG_BSD_DISKLABEL=y
 CONFIG_MAC_PARTITION=y
+CONFIG_MINIX_SUBPARTITION=y
 CONFIG_SMD_DISKLABEL=y
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
@@ -1055,6 +1070,7 @@ CONFIG_NLS_ISO8859_9=m
 CONFIG_NLS_ISO8859_14=m
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_RU=m
 
 #
 # Console drivers
@@ -1115,6 +1131,7 @@ CONFIG_SOUND_EMU10K1=m
 CONFIG_SOUND_ES1370=m
 CONFIG_SOUND_ES1371=m
 CONFIG_SOUND_MAESTRO=m
+CONFIG_SOUND_MAESTRO3=m
 CONFIG_SOUND_ESSSOLO1=m
 CONFIG_SOUND_ICH=m
 CONFIG_SOUND_SONICVIBES=m
@@ -1154,7 +1171,8 @@ CONFIG_SOUND_YM3812=m
 CONFIG_SOUND_VMIDI=m
 CONFIG_SOUND_UART6850=m
 CONFIG_SOUND_NM256=m
-CONFIG_SOUND_YMPCI=m
+CONFIG_SOUND_YMFPCI=m
+CONFIG_SOUND_YMFPCI_LEGACY=y
 
 #
 # Additional low level sound drivers

diff --git a/kernel-i686-smp.config b/kernel-i686-smp.config
index c700b675059c8d9c6703976c6483249ed92d32b4..4cc9c8e99f17b1dd97334aa7fa8e1bf6b17a11ea 100644 (file)
--- a/kernel-i686-smp.config
+++ b/kernel-i686-smp.config
@@ -52,8 +52,6 @@ CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_OLD_PROC is not set
 # CONFIG_MCA is not set
 # CONFIG_VISWS is not set
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_LOCAL_APIC=y
 CONFIG_SYSVIPC=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_SYSCTL=y
@@ -128,22 +126,23 @@ CONFIG_BLK_DEV_IDEDMA=y
 CONFIG_IDEDMA_PCI_EXPERIMENTAL=y
 # CONFIG_IDEDMA_PCI_WIP is not set
 # CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
+CONFIG_BLK_DEV_AEC62XX=y
+CONFIG_BLK_DEV_ALI15X3=y
+CONFIG_BLK_DEV_AMD74XX=y
+CONFIG_BLK_DEV_CMD64X=y
+CONFIG_BLK_DEV_CY82C693=y
 CONFIG_BLK_DEV_CS5530=y
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_PDC202XX is not set
-# CONFIG_BLK_DEV_SIS5513 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_OSB4 is not set
+CONFIG_BLK_DEV_HPT34X=y
+CONFIG_BLK_DEV_HPT366=y
+CONFIG_BLK_DEV_PIIX=y
+CONFIG_BLK_DEV_OPTI621=y
+CONFIG_BLK_DEV_PDC202XX=y
+CONFIG_PDC202XX_BURST=y
+CONFIG_BLK_DEV_SIS5513=y
+CONFIG_BLK_DEV_SLC90E66=y
+CONFIG_BLK_DEV_OSB4=y
 CONFIG_BLK_DEV_TRM290=y
-# CONFIG_BLK_DEV_VIA82CXXX is not set
+CONFIG_BLK_DEV_VIA82CXXX=y
 # CONFIG_IDE_CHIPSETS is not set
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_BLK_DEV_LOOP=m
@@ -159,7 +158,7 @@ CONFIG_MD_LINEAR=m
 CONFIG_MD_STRIPED=m
 CONFIG_MD_MIRRORING=m
 CONFIG_MD_RAID5=m
-CONFIG_MD_TRANSLUCENT=y
+# CONFIG_MD_TRANSLUCENT is not set
 # CONFIG_MD_HSM is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
@@ -320,6 +319,7 @@ CONFIG_PHONE_IXJ=m
 CONFIG_SCSI=m
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
@@ -337,10 +337,10 @@ CONFIG_SCSI_AHA152X=m
 CONFIG_SCSI_AHA1542=m
 CONFIG_SCSI_AHA1740=m
 CONFIG_SCSI_AIC7XXX=m
-# CONFIG_AIC7XXX_TCQ_ON_BY_DEFAULT is not set
 CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
-CONFIG_AIC7XXX_PROC_STATS=y
-CONFIG_AIC7XXX_RESET_DELAY=5
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_IN2000=m
@@ -391,7 +391,6 @@ CONFIG_SCSI_QLOGIC_FAS=m
 CONFIG_SCSI_QLOGIC_ISP=m
 CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_SEAGATE=m
-CONFIG_SCSI_DC395x_TRMS1040=m
 CONFIG_SCSI_DC390T=m
 # CONFIG_SCSI_DC390T_NOGENSUPP is not set
 CONFIG_SCSI_T128=m
@@ -467,6 +466,8 @@ CONFIG_NI52=m
 CONFIG_NI65=m
 CONFIG_RTL8139=m
 CONFIG_RTL8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
 CONFIG_NET_ISA=y
 CONFIG_AT1700=m
 CONFIG_E2100=m
@@ -484,8 +485,10 @@ CONFIG_SEEQ8005=m
 CONFIG_SK_G16=y
 CONFIG_NET_EISA=y
 CONFIG_PCNET32=m
+CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_AC3200=m
 CONFIG_APRICOT=m
+CONFIG_LP486E=m
 CONFIG_CS89x0=m
 CONFIG_DM9102=m
 CONFIG_DE4X5=m
@@ -649,6 +652,7 @@ CONFIG_ISDN=m
 CONFIG_ISDN_PPP=y
 CONFIG_ISDN_PPP_VJ=y
 CONFIG_ISDN_MPP=y
+CONFIG_ISDN_PPP_BSDCOMP=m
 CONFIG_ISDN_AUDIO=y
 # CONFIG_ISDN_TTY_FAX is not set
 # CONFIG_ISDN_X25 is not set
@@ -669,6 +673,7 @@ CONFIG_DE_AOC=y
 # CONFIG_HISAX_NO_LLC is not set
 # CONFIG_HISAX_NO_KEYPAD is not set
 CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
 CONFIG_HISAX_16_0=y
 CONFIG_HISAX_16_3=y
 CONFIG_HISAX_TELESPCI=y
@@ -686,6 +691,7 @@ CONFIG_HISAX_SEDLBAUER=y
 CONFIG_HISAX_SPORTSTER=y
 CONFIG_HISAX_MIC=y
 CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
 CONFIG_HISAX_NICCY=y
 CONFIG_HISAX_ISURF=y
 CONFIG_HISAX_HSTSAPHIR=y
@@ -703,16 +709,27 @@ CONFIG_ISDN_DRV_ICN=m
 CONFIG_ISDN_DRV_PCBIT=m
 CONFIG_ISDN_DRV_SC=m
 CONFIG_ISDN_DRV_ACT2000=m
-CONFIG_ISDN_DRV_EICON=m
+CONFIG_ISDN_DRV_EICON=y
+CONFIG_ISDN_DRV_EICON_DIVAS=m
+CONFIG_ISDN_DRV_EICON_OLD=m
+CONFIG_ISDN_DRV_EICON_PCI=y
 # CONFIG_ISDN_DRV_EICON_ISA is not set
-CONFIG_ISDN_DRV_AVMB1=m
+CONFIG_ISDN_CAPI=m
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
 # CONFIG_ISDN_DRV_AVMB1_B1ISA is not set
 # CONFIG_ISDN_DRV_AVMB1_B1PCI is not set
+# CONFIG_ISDN_DRV_AVMB1_B1PCIV4 is not set
 # CONFIG_ISDN_DRV_AVMB1_T1ISA is not set
 # CONFIG_ISDN_DRV_AVMB1_B1PCMCIA is not set
 # CONFIG_ISDN_DRV_AVMB1_T1PCI is not set
-CONFIG_ISDN_DRV_AVMB1_C4=y
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
 
 #
 # Old CD-ROM drivers (not SCSI, not IDE)
@@ -738,7 +755,6 @@ CONFIG_CDU535=m
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_SERIAL=m
-CONFIG_SERIAL_CONSOLE=y
 CONFIG_SERIAL_EXTENDED=y
 CONFIG_SERIAL_MANY_PORTS=y
 CONFIG_SERIAL_SHARE_IRQ=y
@@ -810,29 +826,19 @@ CONFIG_WATCHDOG=y
 # Watchdog Cards
 #
 # CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_PCWATCHDOG=m
+CONFIG_I810_TCO=m
+CONFIG_MIXCOMWD=m
+CONFIG_60XX_WDT=m
+CONFIG_SOFT_WATCHDOG=m
 CONFIG_WDT=m
 CONFIG_WDT_501=y
 CONFIG_WDT_501_FAN=y
 CONFIG_WDTPCI=m
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_PCWATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_60XX_WDT=m
-CONFIG_MIXCOMWD=m
 CONFIG_NVRAM=m
 CONFIG_RTC=y
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_PHILIPSPAR=m
-CONFIG_I2C_ELV=m
-CONFIG_I2C_VELLEMAN=m
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ELEKTOR=m
-CONFIG_I2C_CHARDEV=m
 # CONFIG_INTEL_RNG is not set
 CONFIG_AGP=m
 CONFIG_AGP_INTEL=y
@@ -903,21 +909,51 @@ CONFIG_FT_ALPHA_CLOCK=0
 CONFIG_USB=m
 CONFIG_USB_DEBUG=y
 CONFIG_USB_DEVICEFS=y
-CONFIG_HOTPLUG=y
 CONFIG_USB_BANDWIDTH=y
 CONFIG_USB_UHCI=m
 CONFIG_USB_UHCI_ALT=m
 CONFIG_USB_OHCI=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_SCANNER=m
 CONFIG_USB_AUDIO=m
+CONFIG_USB_BLUETOOTH=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_STORAGE_DEBUG=y
 CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_HID=m
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_INPUT_KEYBDEV=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_USB_WMFORCE=m
+CONFIG_USB_WACOM=m
+CONFIG_INPUT_EVDEV=m
+CONFIG_USB_DC2XX=m
+CONFIG_USB_MDC800=m
+CONFIG_USB_SCANNER=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_OV511=m
+CONFIG_USB_DSBR=m
+CONFIG_USB_DABUSB=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PLUSB=m
+CONFIG_USB_PEGASUS=m
+
+#
+# USB Serial Converter support
+#
 CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_DEBUG=y
 CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KEYSPAN=m
 CONFIG_USB_SERIAL_KEYSPAN_USA28=y
@@ -925,39 +961,17 @@ CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19=y
 CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
 CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_DEBUG=y
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_OV511=m
-CONFIG_USB_DC2XX=m
-CONFIG_USB_MDC800=m
-CONFIG_USB_STORAGE=m
-CONFIG_USB_STORAGE_DEBUG=y
-CONFIG_USB_DABUSB=m
-CONFIG_USB_PLUSB=m
-CONFIG_USB_PEGASUS=m
 CONFIG_USB_RIO500=m
-CONFIG_USB_DSBR=m
-CONFIG_USB_BLUETOOTH=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_HID=m
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-CONFIG_USB_WACOM=m
-CONFIG_USB_WMFORCE=m
-CONFIG_INPUT_KEYBDEV=m
-CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
 
 #
 # Filesystems
 #
 CONFIG_QUOTA=y
 CONFIG_AUTOFS_FS=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
 CONFIG_ADFS_FS=m
 CONFIG_AFFS_FS=m
 CONFIG_HFS_FS=m
@@ -982,8 +996,6 @@ CONFIG_EXT2_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
 CONFIG_EFS_FS=m
 CONFIG_SGI_PARTITION=y
 
@@ -1017,6 +1029,7 @@ CONFIG_NCPFS_EXTRAS=y
 #
 CONFIG_BSD_DISKLABEL=y
 CONFIG_MAC_PARTITION=y
+CONFIG_MINIX_SUBPARTITION=y
 CONFIG_SMD_DISKLABEL=y
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
@@ -1059,6 +1072,7 @@ CONFIG_NLS_ISO8859_9=m
 CONFIG_NLS_ISO8859_14=m
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_RU=m
 
 #
 # Console drivers
@@ -1119,6 +1133,7 @@ CONFIG_SOUND_EMU10K1=m
 CONFIG_SOUND_ES1370=m
 CONFIG_SOUND_ES1371=m
 CONFIG_SOUND_MAESTRO=m
+CONFIG_SOUND_MAESTRO3=m
 CONFIG_SOUND_ESSSOLO1=m
 CONFIG_SOUND_ICH=m
 CONFIG_SOUND_SONICVIBES=m
@@ -1158,7 +1173,8 @@ CONFIG_SOUND_YM3812=m
 CONFIG_SOUND_VMIDI=m
 CONFIG_SOUND_UART6850=m
 CONFIG_SOUND_NM256=m
-CONFIG_SOUND_YMPCI=m
+CONFIG_SOUND_YMFPCI=m
+CONFIG_SOUND_YMFPCI_LEGACY=y
 
 #
 # Additional low level sound drivers

diff --git a/kernel-i686.config b/kernel-i686.config
index 93182ab6f7b5271e287debf670993077f429e51d..c7fbe6ded92413a5fb49f97cdb5a126ebe6db036 100644 (file)
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -137,6 +137,7 @@ CONFIG_BLK_DEV_HPT366=y
 CONFIG_BLK_DEV_PIIX=y
 CONFIG_BLK_DEV_OPTI621=y
 CONFIG_BLK_DEV_PDC202XX=y
+CONFIG_PDC202XX_BURST=y
 CONFIG_BLK_DEV_SIS5513=y
 CONFIG_BLK_DEV_SLC90E66=y
 CONFIG_BLK_DEV_OSB4=y
@@ -157,7 +158,7 @@ CONFIG_MD_LINEAR=m
 CONFIG_MD_STRIPED=m
 CONFIG_MD_MIRRORING=m
 CONFIG_MD_RAID5=m
-CONFIG_MD_TRANSLUCENT=y
+# CONFIG_MD_TRANSLUCENT is not set
 # CONFIG_MD_HSM is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
@@ -318,6 +319,7 @@ CONFIG_PHONE_IXJ=m
 CONFIG_SCSI=m
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
@@ -335,10 +337,10 @@ CONFIG_SCSI_AHA152X=m
 CONFIG_SCSI_AHA1542=m
 CONFIG_SCSI_AHA1740=m
 CONFIG_SCSI_AIC7XXX=m
-# CONFIG_AIC7XXX_TCQ_ON_BY_DEFAULT is not set
 CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
-CONFIG_AIC7XXX_PROC_STATS=y
-CONFIG_AIC7XXX_RESET_DELAY=5
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_IN2000=m
@@ -389,7 +391,6 @@ CONFIG_SCSI_QLOGIC_FAS=m
 CONFIG_SCSI_QLOGIC_ISP=m
 CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_SEAGATE=m
-CONFIG_SCSI_DC395x_TRMS1040=m
 CONFIG_SCSI_DC390T=m
 # CONFIG_SCSI_DC390T_NOGENSUPP is not set
 CONFIG_SCSI_T128=m
@@ -465,6 +466,8 @@ CONFIG_NI52=m
 CONFIG_NI65=m
 CONFIG_RTL8139=m
 CONFIG_RTL8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
 CONFIG_NET_ISA=y
 CONFIG_AT1700=m
 CONFIG_E2100=m
@@ -482,8 +485,10 @@ CONFIG_SEEQ8005=m
 CONFIG_SK_G16=y
 CONFIG_NET_EISA=y
 CONFIG_PCNET32=m
+CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_AC3200=m
 CONFIG_APRICOT=m
+CONFIG_LP486E=m
 CONFIG_CS89x0=m
 CONFIG_DM9102=m
 CONFIG_DE4X5=m
@@ -647,6 +652,7 @@ CONFIG_ISDN=m
 CONFIG_ISDN_PPP=y
 CONFIG_ISDN_PPP_VJ=y
 CONFIG_ISDN_MPP=y
+CONFIG_ISDN_PPP_BSDCOMP=m
 CONFIG_ISDN_AUDIO=y
 # CONFIG_ISDN_TTY_FAX is not set
 # CONFIG_ISDN_X25 is not set
@@ -667,6 +673,7 @@ CONFIG_DE_AOC=y
 # CONFIG_HISAX_NO_LLC is not set
 # CONFIG_HISAX_NO_KEYPAD is not set
 CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
 CONFIG_HISAX_16_0=y
 CONFIG_HISAX_16_3=y
 CONFIG_HISAX_TELESPCI=y
@@ -684,6 +691,7 @@ CONFIG_HISAX_SEDLBAUER=y
 CONFIG_HISAX_SPORTSTER=y
 CONFIG_HISAX_MIC=y
 CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
 CONFIG_HISAX_NICCY=y
 CONFIG_HISAX_ISURF=y
 CONFIG_HISAX_HSTSAPHIR=y
@@ -701,16 +709,27 @@ CONFIG_ISDN_DRV_ICN=m
 CONFIG_ISDN_DRV_PCBIT=m
 CONFIG_ISDN_DRV_SC=m
 CONFIG_ISDN_DRV_ACT2000=m
-CONFIG_ISDN_DRV_EICON=m
+CONFIG_ISDN_DRV_EICON=y
+CONFIG_ISDN_DRV_EICON_DIVAS=m
+CONFIG_ISDN_DRV_EICON_OLD=m
+CONFIG_ISDN_DRV_EICON_PCI=y
 # CONFIG_ISDN_DRV_EICON_ISA is not set
-CONFIG_ISDN_DRV_AVMB1=m
+CONFIG_ISDN_CAPI=m
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
 # CONFIG_ISDN_DRV_AVMB1_B1ISA is not set
 # CONFIG_ISDN_DRV_AVMB1_B1PCI is not set
+# CONFIG_ISDN_DRV_AVMB1_B1PCIV4 is not set
 # CONFIG_ISDN_DRV_AVMB1_T1ISA is not set
 # CONFIG_ISDN_DRV_AVMB1_B1PCMCIA is not set
 # CONFIG_ISDN_DRV_AVMB1_T1PCI is not set
-CONFIG_ISDN_DRV_AVMB1_C4=y
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
 
 #
 # Old CD-ROM drivers (not SCSI, not IDE)
@@ -736,7 +755,6 @@ CONFIG_CDU535=m
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_SERIAL=m
-CONFIG_SERIAL_CONSOLE=y
 CONFIG_SERIAL_EXTENDED=y
 CONFIG_SERIAL_MANY_PORTS=y
 CONFIG_SERIAL_SHARE_IRQ=y
@@ -808,29 +826,19 @@ CONFIG_WATCHDOG=y
 # Watchdog Cards
 #
 # CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_PCWATCHDOG=m
+CONFIG_I810_TCO=m
+CONFIG_MIXCOMWD=m
+CONFIG_60XX_WDT=m
+CONFIG_SOFT_WATCHDOG=m
 CONFIG_WDT=m
 CONFIG_WDT_501=y
 CONFIG_WDT_501_FAN=y
 CONFIG_WDTPCI=m
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_PCWATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_60XX_WDT=m
-CONFIG_MIXCOMWD=m
 CONFIG_NVRAM=m
 CONFIG_RTC=y
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_PHILIPSPAR=m
-CONFIG_I2C_ELV=m
-CONFIG_I2C_VELLEMAN=m
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ELEKTOR=m
-CONFIG_I2C_CHARDEV=m
 # CONFIG_INTEL_RNG is not set
 CONFIG_AGP=m
 CONFIG_AGP_INTEL=y
@@ -901,21 +909,51 @@ CONFIG_FT_ALPHA_CLOCK=0
 CONFIG_USB=m
 CONFIG_USB_DEBUG=y
 CONFIG_USB_DEVICEFS=y
-CONFIG_HOTPLUG=y
 CONFIG_USB_BANDWIDTH=y
 CONFIG_USB_UHCI=m
 CONFIG_USB_UHCI_ALT=m
 CONFIG_USB_OHCI=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_SCANNER=m
 CONFIG_USB_AUDIO=m
+CONFIG_USB_BLUETOOTH=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_STORAGE_DEBUG=y
 CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_HID=m
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_INPUT_KEYBDEV=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_USB_WMFORCE=m
+CONFIG_USB_WACOM=m
+CONFIG_INPUT_EVDEV=m
+CONFIG_USB_DC2XX=m
+CONFIG_USB_MDC800=m
+CONFIG_USB_SCANNER=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_OV511=m
+CONFIG_USB_DSBR=m
+CONFIG_USB_DABUSB=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PLUSB=m
+CONFIG_USB_PEGASUS=m
+
+#
+# USB Serial Converter support
+#
 CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_DEBUG=y
 CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KEYSPAN=m
 CONFIG_USB_SERIAL_KEYSPAN_USA28=y
@@ -923,39 +961,17 @@ CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19=y
 CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
 CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_DEBUG=y
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_OV511=m
-CONFIG_USB_DC2XX=m
-CONFIG_USB_MDC800=m
-CONFIG_USB_STORAGE=m
-CONFIG_USB_STORAGE_DEBUG=y
-CONFIG_USB_DABUSB=m
-CONFIG_USB_PLUSB=m
-CONFIG_USB_PEGASUS=m
 CONFIG_USB_RIO500=m
-CONFIG_USB_DSBR=m
-CONFIG_USB_BLUETOOTH=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_HID=m
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-CONFIG_USB_WACOM=m
-CONFIG_USB_WMFORCE=m
-CONFIG_INPUT_KEYBDEV=m
-CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
 
 #
 # Filesystems
 #
 CONFIG_QUOTA=y
 CONFIG_AUTOFS_FS=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
 CONFIG_ADFS_FS=m
 CONFIG_AFFS_FS=m
 CONFIG_HFS_FS=m
@@ -980,8 +996,6 @@ CONFIG_EXT2_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
 CONFIG_EFS_FS=m
 CONFIG_SGI_PARTITION=y
 
@@ -1015,6 +1029,7 @@ CONFIG_NCPFS_EXTRAS=y
 #
 CONFIG_BSD_DISKLABEL=y
 CONFIG_MAC_PARTITION=y
+CONFIG_MINIX_SUBPARTITION=y
 CONFIG_SMD_DISKLABEL=y
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
@@ -1057,6 +1072,7 @@ CONFIG_NLS_ISO8859_9=m
 CONFIG_NLS_ISO8859_14=m
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_RU=m
 
 #
 # Console drivers
@@ -1117,6 +1133,7 @@ CONFIG_SOUND_EMU10K1=m
 CONFIG_SOUND_ES1370=m
 CONFIG_SOUND_ES1371=m
 CONFIG_SOUND_MAESTRO=m
+CONFIG_SOUND_MAESTRO3=m
 CONFIG_SOUND_ESSSOLO1=m
 CONFIG_SOUND_ICH=m
 CONFIG_SOUND_SONICVIBES=m
@@ -1156,7 +1173,8 @@ CONFIG_SOUND_YM3812=m
 CONFIG_SOUND_VMIDI=m
 CONFIG_SOUND_UART6850=m
 CONFIG_SOUND_NM256=m
-CONFIG_SOUND_YMPCI=m
+CONFIG_SOUND_YMFPCI=m
+CONFIG_SOUND_YMFPCI_LEGACY=y
 
 #
 # Additional low level sound drivers