r4321 - dists/trunk/linux-2.6/debian/arch/i386

[Simon Horman]

Author: horms
Date: 2005-10-06 12:56:10 +0000 (Thu, 06 Oct 2005)
New Revision: 4321

Modified:
   dists/trunk/linux-2.6/debian/arch/i386/config
Log:
strangely i386 suddlenly stopped working where it has worked before. this seems to fis the problem

Modified: dists/trunk/linux-2.6/debian/arch/i386/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	2005-10-06 12:17:26 UTC (rev 4320)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	2005-10-06 12:56:10 UTC (rev 4321)
@@ -322,7 +322,6 @@
 CONFIG_IDE_GENERIC=m
 CONFIG_BLK_DEV_CMD640=y
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=m
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
@@ -445,7 +444,6 @@
 CONFIG_MD_RAID6=m
 CONFIG_MD_FAULTY=m
 CONFIG_DM_MULTIPATH_EMC=m
-CONFIG_FUSION=m
 CONFIG_FUSION_MAX_SGE=40
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
@@ -1918,3 +1916,13 @@
 CONFIG_HZ=1000
 CONFIG_PHYSICAL_START=0x100000
 # CONFIG_HOTPLUG_CPU is not set
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_FLATMEM=y
+CONFIG_SCSI_QLA2XXX=m
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_USB_EMI26 is not set
+CONFIG_FUSION=y
+# CONFIG_BLK_DEV_IDEPNP is not set