- added description of djurban's branch

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

diff --git a/kernel-i686.config b/kernel-i686.config
index ea353983b2fde30eeddb9e47dcc9e87ace616d01..526d4605d7ed5f557872425a28e0e195f2e5e5e4 100644 (file)
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -269,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
@@ -313,8 +313,8 @@ 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_ONLYDISK=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
@@ -345,7 +345,7 @@ 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_BLK_DEV_VIA82CXXX=n
 CONFIG_IDE_CHIPSETS=y
 CONFIG_BLK_DEV_4DRIVES=y
 CONFIG_BLK_DEV_ALI14XX=y
@@ -1200,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