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

[Jurij Smakov]

Author: jurij-guest
Date: 2005-10-09 06:07:22 +0000 (Sun, 09 Oct 2005)
New Revision: 4357

Modified:
   dists/trunk/linux-2.6/debian/arch/i386/config
Log:
Config updates for 2.6.13. Main change I wanted
to do is to enable HPET_EMULATE_RTC which fixes
309909. That required setting RTC=y instead of
RTC=m. Since it looks like I was the first person
to run split-config for 2.6.13, it also set a
bunch of unrelated options. I'll post to d-k to
make sure that this is a sane thing.


Modified: dists/trunk/linux-2.6/debian/arch/i386/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	2005-10-09 00:37:36 UTC (rev 4356)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	2005-10-09 06:07:22 UTC (rev 4357)
@@ -445,7 +445,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 +1917,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_HPET_EMULATE_RTC=y
+# CONFIG_USB_EMI26 is not set
+CONFIG_FUSION=y