- updated to 2.2.6

Changed files:
    kernel-i386.config -> 1.2

diff --git a/kernel-i386.config b/kernel-i386.config
index 3a6b2ba5a6afdead3ffa5b6c0621ebddef5c4698..2635806d2323260758d92e1cfa846e238ba36a29 100644 (file)
--- a/kernel-i386.config
+++ b/kernel-i386.config
@@ -1,5 +1,5 @@
 #
-# Automatically generated make config: don't edit
+# Automatically generated by make menuconfig: don't edit
 #
 
 #
@@ -23,7 +23,7 @@ CONFIG_MATH_EMULATION=y
 # Loadable module support
 #
 CONFIG_MODULES=y
-CONFIG_MODVERSIONS=y
+# CONFIG_MODVERSIONS is not set
 CONFIG_KMOD=y
 
 #
@@ -44,33 +44,32 @@ CONFIG_PCI_QUIRKS=y
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
-# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_AOUT=m
 CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
+CONFIG_BINFMT_MISC=m
 # CONFIG_BINFMT_JAVA is not set
-# CONFIG_PARPORT is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+# CONFIG_PARPORT_OTHER is not set
 # CONFIG_APM is not set
 
 #
 # Plug and Play support
 #
-# CONFIG_PNP is not set
+CONFIG_PNP=y
+CONFIG_PNP_PARPORT=m
 
 #
 # Block devices
 #
 CONFIG_BLK_DEV_FD=y
 CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
 # CONFIG_BLK_DEV_HD_IDE is not set
 CONFIG_BLK_DEV_IDEDISK=y
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
+CONFIG_BLK_DEV_IDEFLOPPY=m
+CONFIG_BLK_DEV_IDESCSI=m
 CONFIG_BLK_DEV_CMD640=y
 CONFIG_BLK_DEV_CMD640_ENHANCED=y
 CONFIG_BLK_DEV_RZ1000=y
@@ -84,18 +83,33 @@ CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_BLK_DEV_VIA82C586 is not set
 # CONFIG_BLK_DEV_CMD646 is not set
 # CONFIG_IDE_CHIPSETS is not set
-
-#
-# Additional Block Devices
-#
 CONFIG_BLK_DEV_LOOP=m
-# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_NBD=m
 # CONFIG_BLK_DEV_MD is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_INITRD=y
-# CONFIG_BLK_DEV_XD is not set
-CONFIG_PARIDE_PARPORT=y
-# CONFIG_PARIDE is not set
+CONFIG_BLK_DEV_XD=m
+CONFIG_PARIDE_PARPORT=m
+CONFIG_PARIDE=m
+# CONFIG_PARIDE_PD is not set
+CONFIG_PARIDE_PCD=m
+CONFIG_PARIDE_PF=m
+CONFIG_PARIDE_PT=m
+CONFIG_PARIDE_PG=m
+CONFIG_PARIDE_ATEN=m
+CONFIG_PARIDE_BPCK=m
+CONFIG_PARIDE_COMM=m
+CONFIG_PARIDE_DSTR=m
+CONFIG_PARIDE_FIT2=m
+CONFIG_PARIDE_FIT3=m
+CONFIG_PARIDE_EPAT=m
+CONFIG_PARIDE_EPIA=m
+CONFIG_PARIDE_FRIQ=m
+CONFIG_PARIDE_FRPW=m
+CONFIG_PARIDE_KBIC=m
+CONFIG_PARIDE_KTTI=m
+CONFIG_PARIDE_ON20=m
+CONFIG_PARIDE_ON26=m
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -104,37 +118,31 @@ CONFIG_PARIDE_PARPORT=y
 CONFIG_PACKET=y
 CONFIG_NETLINK=y
 CONFIG_RTNETLINK=y
-# CONFIG_NETLINK_DEV is not set
+CONFIG_NETLINK_DEV=m
 # CONFIG_FIREWALL is not set
-# CONFIG_NET_ALIAS is not set
 # CONFIG_FILTER is not set
 CONFIG_UNIX=y
 CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
+CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
 # CONFIG_IP_PNP is not set
 # CONFIG_IP_ROUTER is not set
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE=m
+# CONFIG_NET_IPGRE_BROADCAST is not set
+# CONFIG_IP_MROUTE is not set
 # CONFIG_IP_ALIAS is not set
 # CONFIG_ARPD is not set
 # CONFIG_SYN_COOKIES is not set
-
-#
-# (it is safe to leave these untouched)
-#
-# CONFIG_INET_RARP is not set
-CONFIG_IP_NOSR=y
+CONFIG_INET_RARP=m
 # CONFIG_SKB_LARGE is not set
-CONFIG_IPV6=y
+CONFIG_IPV6=m
 CONFIG_IPV6_EUI64=y
 CONFIG_IPV6_NO_PB=y
-
-#
-#  
-#
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_SPX=m
+CONFIG_ATALK=m
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
 # CONFIG_BRIDGE is not set
@@ -154,19 +162,11 @@ CONFIG_IPV6_NO_PB=y
 # SCSI support
 #
 CONFIG_SCSI=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
 CONFIG_BLK_DEV_SD=y
 # CONFIG_CHR_DEV_ST is not set
 CONFIG_BLK_DEV_SR=y
 # CONFIG_BLK_DEV_SR_VENDOR is not set
-# CONFIG_CHR_DEV_SG is not set
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
+CONFIG_CHR_DEV_SG=m
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 # CONFIG_SCSI_LOGGING is not set
@@ -175,7 +175,7 @@ CONFIG_SCSI_CONSTANTS=y
 # SCSI low-level drivers
 #
 CONFIG_SCSI_7000FASST=y
-# CONFIG_SCSI_ACARD is not set
+CONFIG_SCSI_ACARD=y
 CONFIG_SCSI_AHA152X=y
 CONFIG_SCSI_AHA1542=y
 CONFIG_SCSI_AHA1740=y
@@ -183,16 +183,20 @@ CONFIG_SCSI_AIC7XXX=y
 # CONFIG_OVERRIDE_CMDS is not set
 CONFIG_AIC7XXX_PROC_STATS=y
 CONFIG_AIC7XXX_RESET_DELAY=5
-# CONFIG_SCSI_ADVANSYS is not set
+CONFIG_SCSI_ADVANSYS=y
 CONFIG_SCSI_IN2000=y
 CONFIG_SCSI_AM53C974=y
-# CONFIG_SCSI_MEGARAID is not set
+CONFIG_SCSI_MEGARAID=y
+# CONFIG_MEGARAID_MULTI_IO is not set
 CONFIG_SCSI_BUSLOGIC=y
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
 CONFIG_SCSI_DTC3280=y
-# CONFIG_SCSI_EATA is not set
+CONFIG_SCSI_EATA=y
+# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
+# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
+CONFIG_SCSI_EATA_MAX_TAGS=16
 # CONFIG_SCSI_EATA_DMA is not set
-# CONFIG_SCSI_EATA_PIO is not set
+CONFIG_SCSI_EATA_PIO=y
 CONFIG_SCSI_FUTURE_DOMAIN=y
 CONFIG_SCSI_GDTH=y
 CONFIG_SCSI_GENERIC_NCR5380=y
@@ -200,7 +204,13 @@ CONFIG_SCSI_GENERIC_NCR5380=y
 CONFIG_SCSI_G_NCR5380_PORT=y
 # CONFIG_SCSI_G_NCR5380_MEM is not set
 CONFIG_SCSI_INITIO=y
+CONFIG_SCSI_INIA100=y
+# CONFIG_SCSI_PPA is not set
+CONFIG_SCSI_IMM=m
+CONFIG_SCSI_IZIP_EPP16=y
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
 CONFIG_SCSI_NCR53C406A=y
+CONFIG_SCSI_SYM53C416=y
 CONFIG_SCSI_NCR53C7xx=y
 # CONFIG_SCSI_NCR53C7xx_sync is not set
 # CONFIG_SCSI_NCR53C7xx_FAST is not set
@@ -211,6 +221,7 @@ CONFIG_SCSI_PCI2220I=y
 CONFIG_SCSI_PSI240I=y
 CONFIG_SCSI_QLOGIC_FAS=y
 CONFIG_SCSI_QLOGIC_ISP=y
+CONFIG_SCSI_QLOGIC_FC=y
 CONFIG_SCSI_SEAGATE=y
 CONFIG_SCSI_DC390T=y
 # CONFIG_SCSI_DC390T_NOGENSUPP is not set
@@ -225,10 +236,16 @@ CONFIG_SCSI_ULTRASTOR=y
 # Network device support
 #
 CONFIG_NETDEVICES=y
-# CONFIG_ARCNET is not set
+CONFIG_ARCNET=m
+CONFIG_ARCNET_ETH=y
+CONFIG_ARCNET_1051=y
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
 CONFIG_DUMMY=m
-# CONFIG_EQUALIZER is not set
-# CONFIG_ETHERTAP is not set
+CONFIG_EQUALIZER=m
+CONFIG_ETHERTAP=m
 CONFIG_NET_ETHERNET=y
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_EL1=m
@@ -238,7 +255,7 @@ CONFIG_EL16=m
 CONFIG_EL3=m
 CONFIG_3C515=m
 CONFIG_VORTEX=m
-CONFIG_LANCE=y
+CONFIG_LANCE=m
 CONFIG_NET_VENDOR_SMC=y
 CONFIG_WD80x3=m
 CONFIG_ULTRA=m
@@ -249,10 +266,10 @@ CONFIG_RTL8139=m
 CONFIG_YELLOWFIN=m
 CONFIG_ACENIC=m
 CONFIG_NET_ISA=y
-# CONFIG_AT1700 is not set
+CONFIG_AT1700=m
 CONFIG_E2100=m
-# CONFIG_DEPCA is not set
-# CONFIG_EWRK3 is not set
+CONFIG_DEPCA=m
+CONFIG_EWRK3=m
 CONFIG_EEXPRESS=m
 CONFIG_EEXPRESS_PRO=m
 CONFIG_FMV18X=m
@@ -265,20 +282,20 @@ CONFIG_NE2000=m
 # CONFIG_SK_G16 is not set
 CONFIG_NET_EISA=y
 CONFIG_PCNET32=m
-# CONFIG_AC3200 is not set
+CONFIG_AC3200=m
 CONFIG_APRICOT=m
 CONFIG_CS89x0=m
 CONFIG_DE4X5=m
 CONFIG_DEC_ELCP=m
 CONFIG_DGRS=m
 CONFIG_EEXPRESS_PRO100=m
-# CONFIG_LNE390 is not set
-# CONFIG_NE3210 is not set
+CONFIG_LNE390=m
+CONFIG_NE3210=m
 CONFIG_NE2K_PCI=m
 CONFIG_TLAN=m
 CONFIG_VIA_RHINE=m
-# CONFIG_ES3210 is not set
-# CONFIG_EPIC100 is not set
+CONFIG_ES3210=m
+CONFIG_EPIC100=m
 # CONFIG_ZNET is not set
 CONFIG_NET_POCKET=y
 # CONFIG_ATP is not set
@@ -287,11 +304,13 @@ CONFIG_DE620=m
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 # CONFIG_DLCI is not set
+# CONFIG_LTPC is not set
+# CONFIG_COPS is not set
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+CONFIG_PLIP=m
 CONFIG_PPP=m
-
-#
-# CCP compressors for PPP are only built as modules.
-#
 CONFIG_SLIP=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
@@ -300,9 +319,9 @@ CONFIG_NET_RADIO=y
 # CONFIG_STRIP is not set
 # CONFIG_WAVELAN is not set
 # CONFIG_TR is not set
-# CONFIG_SHAPER is not set
-# CONFIG_HOSTESS_SV11 is not set
-# CONFIG_COSA is not set
+CONFIG_SHAPER=m
+CONFIG_HOSTESS_SV11=m
+CONFIG_COSA=m
 # CONFIG_RCPCI is not set
 
 #
@@ -321,7 +340,7 @@ CONFIG_NET_RADIO=y
 # CONFIG_ISDN is not set
 
 #
-# CD-ROM drivers (not for SCSI or IDE/ATAPI drives)
+# Old CD-ROM drivers (not SCSI, not IDE)
 #
 # CONFIG_CD_NO_IDESCSI is not set
 
@@ -336,6 +355,7 @@ CONFIG_SERIAL=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX98_PTY_COUNT=2048
+# CONFIG_PRINTER is not set
 CONFIG_MOUSE=y
 
 #
@@ -348,24 +368,66 @@ CONFIG_PSMOUSE=y
 CONFIG_82C710_MOUSE=m
 CONFIG_PC110_PAD=m
 # CONFIG_QIC02_TAPE is not set
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WDT=m
+# CONFIG_WDT_501 is not set
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_PCWATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
 CONFIG_NVRAM=m
 # CONFIG_RTC is not set
 
 #
 # Video For Linux
 #
-# CONFIG_VIDEO_DEV is not set
+CONFIG_VIDEO_DEV=m
+CONFIG_RADIO_RTRACK=m
+CONFIG_RADIO_RTRACK2=m
+CONFIG_RADIO_AZTECH=m
+# CONFIG_RADIO_CADET is not set
+CONFIG_RADIO_MIROPCM20=m
+CONFIG_RADIO_GEMTEK=m
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_PMS=m
+CONFIG_VIDEO_SAA5249=m
+CONFIG_RADIO_SF16FMI=m
+CONFIG_RADIO_TYPHOON=m
+CONFIG_RADIO_TYPHOON_PROC_FS=y
+CONFIG_RADIO_ZOLTRIX=m
 
 #
 # Joystick support
 #
 # CONFIG_JOYSTICK is not set
+# CONFIG_DTLK is not set
 
 #
 # Ftape, the floppy tape device driver
 #
-# CONFIG_FTAPE is not set
+CONFIG_FTAPE=m
+CONFIG_ZFTAPE=m
+CONFIG_ZFT_DFLT_BLK_SZ=10240
+CONFIG_ZFT_COMPRESSOR=m
+CONFIG_FT_NR_BUFFERS=3
+# CONFIG_FT_PROC_FS is not set
+CONFIG_FT_NORMAL_DEBUG=y
+# CONFIG_FT_FULL_DEBUG is not set
+# CONFIG_FT_NO_TRACE is not set
+# CONFIG_FT_NO_TRACE_AT_ALL is not set
+CONFIG_FT_STD_FDC=y
+# CONFIG_FT_MACH2 is not set
+# CONFIG_FT_PROBE_FC10 is not set
+# CONFIG_FT_ALT_FDC is not set
+CONFIG_FT_FDC_THR=8
+CONFIG_FT_FDC_MAX_RATE=2000
+CONFIG_FT_ALPHA_CLOCK=0
 
 #
 # Filesystems
@@ -382,28 +444,37 @@ CONFIG_VFAT_FS=m
 CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_MINIX_FS=m
-# CONFIG_NTFS_FS is not set
-# CONFIG_HPFS_FS is not set
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_RW is not set
+CONFIG_HPFS_FS=m
 CONFIG_PROC_FS=y
 CONFIG_DEVPTS_FS=y
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_ROMFS_FS is not set
+CONFIG_QNX4FS_FS=m
+# CONFIG_QNX4FS_RW is not set
+CONFIG_ROMFS_FS=m
 CONFIG_EXT2_FS=y
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
 
 #
 # Network File Systems
 #
-# CONFIG_CODA_FS is not set
+CONFIG_CODA_FS=m
 CONFIG_NFS_FS=m
 CONFIG_NFSD=m
 # CONFIG_NFSD_SUN is not set
 CONFIG_SUNRPC=m
 CONFIG_LOCKD=m
-# CONFIG_SMB_FS is not set
-# CONFIG_NCP_FS is not set
-CONFIG_AMIGA_PARTITION=y
+CONFIG_SMB_FS=m
+# CONFIG_SMB_WIN95 is not set
+CONFIG_NCP_FS=m
+# CONFIG_NCPFS_PACKET_SIGNING is not set
+# CONFIG_NCPFS_IOCTL_LOCKING is not set
+# CONFIG_NCPFS_STRONG is not set
+CONFIG_NCPFS_NFS_NS=y
+CONFIG_NCPFS_OS2_NS=y
+CONFIG_NCPFS_MOUNT_SUBDIR=y
 
 #
 # Partition Types
@@ -413,6 +484,7 @@ CONFIG_AMIGA_PARTITION=y
 # CONFIG_SMD_DISKLABEL is not set
 # CONFIG_SOLARIS_X86_PARTITION is not set
 # CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_AMIGA_PARTITION=y
 CONFIG_NLS=y
 
 #
@@ -450,7 +522,7 @@ CONFIG_NLS_KOI8_R=m
 # Console drivers
 #
 CONFIG_VGA_CONSOLE=y
-# CONFIG_VIDEO_SELECT is not set
+CONFIG_VIDEO_SELECT=y
 # CONFIG_MDA_CONSOLE is not set
 # CONFIG_FB is not set