- added description of djurban's branch

[packages/kernel.git] / kernel-i686.config

diff --git a/kernel-i686.config b/kernel-i686.config
index 1285771b668e30cc163004da87ada751b9ab6ca2..526d4605d7ed5f557872425a28e0e195f2e5e5e4 100644 (file)
--- 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
@@ -218,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
@@ -243,6 +246,7 @@ CONFIG_NET_SCH_CSZ=m
 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
@@ -265,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
@@ -294,12 +298,13 @@ CONFIG_BLK_DEV_IDEDISK=m
 # 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_IDE_TASKFILE_IO is not set
 CONFIG_BLK_DEV_CMD640=y
 CONFIG_BLK_DEV_CMD640_ENHANCED=y
 CONFIG_BLK_DEV_RZ1000=y
@@ -308,13 +313,12 @@ 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=y
+# 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 is not set
 CONFIG_BLK_DEV_ADMA=y
 CONFIG_BLK_DEV_AEC62XX=y
 CONFIG_AEC62XX_TUNING=y
@@ -341,11 +345,16 @@ CONFIG_BLK_DEV_SVWKS=y
 CONFIG_BLK_DEV_SIS5513=y
 CONFIG_BLK_DEV_SLC90E66=y
 CONFIG_BLK_DEV_TRM290=y
-CONFIG_BLK_DEV_VIA82CXXX=y
-# CONFIG_IDE_CHIPSETS is not set
-# CONFIG_BLK_DEV_ELEVATOR_NOOP is not set
-CONFIG_IDEDMA_AUTO=y
-# CONFIG_IDEDMA_IVB is not set
+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
 
@@ -378,7 +387,6 @@ 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_DC395x_TRMS1040=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_IN2000=m
@@ -429,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
@@ -478,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
 
@@ -1046,6 +1056,8 @@ 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
@@ -1188,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