X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel-i686.config;h=526d4605d7ed5f557872425a28e0e195f2e5e5e4;hb=aa58153d4882936289acd0ee8122cdb2d1d27a96;hp=80c07ffbe643bc23c03b6aa08fd3835338047d65;hpb=175d11fa49f4479999cb23ab205bd6bd53a104f3;p=packages%2Fkernel.git

diff --git a/kernel-i686.config b/kernel-i686.config
index 80c07ffb..526d4605 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -16,10 +16,13 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_M586 is not set
 # CONFIG_M586TSC is not set
 CONFIG_M686=y
+# CONFIG_M686_L1_64 is not set
+# CONFIG_M686_L1_128 is not set
 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_INVLPG=y
 CONFIG_X86_BSWAP=y
 CONFIG_X86_POPAD_OK=y
+CONFIG_X86_TSC=y
 CONFIG_X86_GOOD_APIC=y
 CONFIG_MICROCODE=m
 CONFIG_X86_MSR=m
@@ -40,6 +43,7 @@ CONFIG_KMOD=y
 #
 # General setup
 #
+CONFIG_BIGMEM=y
 CONFIG_NET=y
 CONFIG_PCI=y
 # CONFIG_PCI_GOBIOS is not set
@@ -104,50 +108,6 @@ CONFIG_PNP_PARPORT=m
 # Block devices
 #
 CONFIG_BLK_DEV_FD=m
-CONFIG_BLK_DEV_IDE=m
-# CONFIG_BLK_DEV_HD_IDE is not set
-CONFIG_BLK_DEV_IDEDISK=m
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_IDEDISK_STROKE is not set
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEFLOPPY=m
-CONFIG_BLK_DEV_IDESCSI=m
-# CONFIG_IDE_TASK_IOCTL is not set
-# CONFIG_PKT_TASK_IOCTL is not set
-# CONFIG_IDE_TASK_IOCTL_DEBUG is not set
-CONFIG_BLK_DEV_CMD640=y
-CONFIG_BLK_DEV_CMD640_ENHANCED=y
-CONFIG_BLK_DEV_RZ1000=y
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_IDEPCI_SHARE_IRQ is not set
-CONFIG_BLK_DEV_IDEDMA=y
-CONFIG_IDEDMA_AUTO=y
-# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
-CONFIG_IDEDMA_PCI_EXPERIMENTAL=y
-# CONFIG_IDEDMA_PCI_WIP is not set
-# CONFIG_BLK_DEV_OFFBOARD 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=y
-CONFIG_BLK_DEV_HPT366=y
-CONFIG_BLK_DEV_PIIX=y
-CONFIG_PIIX_TUNING=y
-CONFIG_BLK_DEV_OPTI621=y
-CONFIG_BLK_DEV_PDC202XX=y
-CONFIG_PDC202XX_BURST=y
-CONFIG_PDC202XX_FORCE=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=n
-# CONFIG_IDE_CHIPSETS is not set
-# CONFIG_IDEDMA_IVB is not set
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_LOOP_USE_REL_BLOCK=y
 CONFIG_BLK_DEV_LOOP_GEN_SEL="m"
@@ -189,10 +149,8 @@ CONFIG_PARIDE_KBIC=m
 CONFIG_PARIDE_KTTI=m
 CONFIG_PARIDE_ON20=m
 CONFIG_PARIDE_ON26=m
-CONFIG_BLK_DEV_IDE_MODES=y
 CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m
-# CONFIG_BLK_DEV_HD is not set
 
 #
 # Networking options
@@ -264,7 +222,6 @@ CONFIG_IPX=m
 CONFIG_SPX=m
 CONFIG_ATALK=m
 CONFIG_BRIDGE=m
-CONFIG_BRIDGE_NUM_PORTS=8
 CONFIG_X25=m
 CONFIG_LAPB=m
 # CONFIG_NET_DIVERT is not set
@@ -286,9 +243,10 @@ CONFIG_NETLINK=y
 CONFIG_RTNETLINK=y
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_CSZ=m
-# CONFIG_NET_SCH_HTB is not set
+CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_ATM=y
 CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_WRR=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TEQL=m
@@ -311,7 +269,7 @@ CONFIG_IPSEC_AUTH_HMAC_SHA1=y
 CONFIG_IPSEC_ESP=y
 CONFIG_IPSEC_ENC_3DES=y
 CONFIG_IPSEC_IPCOMP=y
-CONFIG_IPSEC_DEBUG=y
+# CONFIG_IPSEC_DEBUG is not set
 
 #
 # Telephony Support
@@ -319,6 +277,87 @@ CONFIG_IPSEC_DEBUG=y
 CONFIG_PHONE=m
 CONFIG_PHONE_IXJ=m
 
+#
+# ATA/IDE/MFM/RLL support
+#
+CONFIG_IDE=m
+
+#
+# IDE, ATA and ATAPI Block devices
+#
+CONFIG_BLK_DEV_IDE=m
+# CONFIG_BLK_DEV_HD_IDE is not set
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_IDEDISK=m
+# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_IDEDISK_STROKE is not set
+# CONFIG_BLK_DEV_IDEDISK_VENDOR is not set
+# CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set
+# CONFIG_BLK_DEV_IDEDISK_IBM is not set
+# CONFIG_BLK_DEV_IDEDISK_MAXTOR is not set
+# CONFIG_BLK_DEV_IDEDISK_QUANTUM is not set
+# CONFIG_BLK_DEV_IDEDISK_SEAGATE is not set
+# CONFIG_BLK_DEV_IDEDISK_WD is not set
+# CONFIG_BLK_DEV_COMMERIAL is not set
+# CONFIG_BLK_DEV_TIVO is not set
+CONFIG_BLK_DEV_IDECD=m
+CONFIG_BLK_DEV_IDETAPE=m
+CONFIG_BLK_DEV_IDEFLOPPY=m
+CONFIG_BLK_DEV_IDESCSI=m
+# CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_BLK_DEV_CMD640=y
+CONFIG_BLK_DEV_CMD640_ENHANCED=y
+CONFIG_BLK_DEV_RZ1000=y
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+# CONFIG_IDEDMA_PCI_AUTO is not set
+# CONFIG_IDEDMA_ONLYDISK is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_PCI_WIP is not set
+# CONFIG_BLK_DEV_IDEDMA_TIMEOUT is not set
+# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
+CONFIG_BLK_DEV_ADMA=y
+CONFIG_BLK_DEV_AEC62XX=y
+CONFIG_AEC62XX_TUNING=y
+CONFIG_BLK_DEV_ALI15X3=y
+CONFIG_WDC_ALI15X3=y
+CONFIG_BLK_DEV_AMD74XX=y
+# CONFIG_AMD74XX_OVERRIDE is not set
+CONFIG_BLK_DEV_CMD64X=y
+CONFIG_BLK_DEV_CMD680=y
+CONFIG_BLK_DEV_CY82C693=y
+CONFIG_BLK_DEV_CS5530=y
+CONFIG_BLK_DEV_HPT34X=y
+# CONFIG_HPT34X_AUTODMA is not set
+CONFIG_BLK_DEV_HPT366=y
+CONFIG_BLK_DEV_PIIX=y
+CONFIG_PIIX_TUNING=y
+CONFIG_BLK_DEV_NS87415=y
+CONFIG_BLK_DEV_OPTI621=y
+# CONFIG_BLK_DEV_PDC_ADMA is not set
+CONFIG_BLK_DEV_PDC202XX=y
+CONFIG_PDC202XX_BURST=y
+CONFIG_PDC202XX_FORCE=y
+CONFIG_BLK_DEV_SVWKS=y
+CONFIG_BLK_DEV_SIS5513=y
+CONFIG_BLK_DEV_SLC90E66=y
+CONFIG_BLK_DEV_TRM290=y
+CONFIG_BLK_DEV_VIA82CXXX=n
+CONFIG_IDE_CHIPSETS=y
+CONFIG_BLK_DEV_4DRIVES=y
+CONFIG_BLK_DEV_ALI14XX=y
+CONFIG_BLK_DEV_DTC2278=y
+CONFIG_BLK_DEV_HT6560B=y
+CONFIG_BLK_DEV_QD65XX=y
+CONFIG_BLK_DEV_UMC8672=y
+CONFIG_IDEDMA_AUTO=n
+CONFIG_IDEDMA_IVB=y
+# CONFIG_DMA_NONPCI is not set
+CONFIG_BLK_DEV_IDE_MODES=y
+
 #
 # SCSI support
 #
@@ -347,6 +386,7 @@ CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
 CONFIG_AIC7XXX_RESET_DELAY_MS=15000
 # CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
+CONFIG_SCSI_DPT_I2O=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_IN2000=m
@@ -397,6 +437,7 @@ 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
@@ -446,6 +487,7 @@ CONFIG_ARCNET_COM20020=m
 CONFIG_DUMMY=m
 CONFIG_BONDING=m
 CONFIG_EQUALIZER=m
+CONFIG_IMQ=y
 CONFIG_ETHERTAP=m
 CONFIG_NET_SB1000=m
 
@@ -460,7 +502,6 @@ CONFIG_ELPLUS=m
 CONFIG_EL16=m
 CONFIG_EL3=m
 CONFIG_3C515=m
-CONFIG_BC90X=m
 CONFIG_VORTEX=m
 CONFIG_LANCE=m
 CONFIG_NET_VENDOR_SMC=y
@@ -574,6 +615,7 @@ CONFIG_HOSTESS_SV11=m
 CONFIG_COSA=m
 CONFIG_SEALEVEL_4021=m
 CONFIG_SYNCLINK_SYNCPPP=m
+CONFIG_FARSYNC=m
 CONFIG_LANMEDIA=m
 CONFIG_COMX=m
 CONFIG_COMX_HW_COMX=m
@@ -1008,16 +1050,22 @@ 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_IR=m
 CONFIG_USB_SERIAL_EDGEPORT=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KEYSPAN=m
 CONFIG_USB_SERIAL_KEYSPAN_USA28=y
 CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
 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_MCT_U232=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
 CONFIG_USB_SERIAL_OMNINET=m
 CONFIG_USB_RIO500=m
 
@@ -1152,13 +1200,13 @@ CONFIG_FB_MATROX_MULTIHEAD=y
 CONFIG_FB_ATY128=m
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_FBCON_ADVANCED=y
-CONFIG_FBCON_MFB=m
-CONFIG_FBCON_CFB2=m
-CONFIG_FBCON_CFB4=m
-CONFIG_FBCON_CFB8=m
-CONFIG_FBCON_CFB16=m
-CONFIG_FBCON_CFB24=m
-CONFIG_FBCON_CFB32=m
+CONFIG_FBCON_MFB=y
+CONFIG_FBCON_CFB2=y
+CONFIG_FBCON_CFB4=y
+CONFIG_FBCON_CFB8=y
+CONFIG_FBCON_CFB16=y
+CONFIG_FBCON_CFB24=y
+CONFIG_FBCON_CFB32=y
 # CONFIG_FBCON_AFB is not set
 # CONFIG_FBCON_ILBM is not set
 # CONFIG_FBCON_IPLAN2P2 is not set