r4311 - in dists/trunk/linux-2.6/debian: . arch/ia64

[Dann Frazier]

Author: dannf
Date: 2005-10-05 22:21:57 +0000 (Wed, 05 Oct 2005)
New Revision: 4311

Modified:
   dists/trunk/linux-2.6/debian/arch/ia64/config
   dists/trunk/linux-2.6/debian/changelog
Log:
* [ia64] Update arch/ia64/config for 2.6.13

Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config	2005-10-05 22:07:55 UTC (rev 4310)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config	2005-10-05 22:21:57 UTC (rev 4311)
@@ -24,12 +24,16 @@
 # CONFIG_IA64_PAGE_SIZE_8KB is not set
 CONFIG_IA64_PAGE_SIZE_16KB=y
 # CONFIG_IA64_PAGE_SIZE_64KB is not set
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_1000 is not set
 CONFIG_NUMA=y
 CONFIG_VIRTUAL_MEM_MAP=y
 CONFIG_HOLES_IN_ZONE=y
-CONFIG_DISCONTIGMEM=y
+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
 # CONFIG_IA64_CYCLONE is not set
 CONFIG_IOSAPIC=y
+CONFIG_IA64_SGI_SN_XP=m
 CONFIG_FORCE_MAX_ZONEORDER=18
 CONFIG_IA32_SUPPORT=y
 CONFIG_COMPAT=y
@@ -45,6 +49,7 @@
 CONFIG_ACPI_INTERPRETER=y
 CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_HOTKEY=m
 CONFIG_ACPI_FAN=m
 CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_THERMAL=m
@@ -68,6 +73,7 @@
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_HOTPLUG_PCI_SHPC=m
+CONFIG_HOTPLUG_PCI_SGI=m
 # CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
 CONFIG_PCCARD=m
 # CONFIG_PCMCIA_DEBUG is not set
@@ -312,6 +318,8 @@
 CONFIG_I2O_BLOCK=m
 CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
+# CONFIG_I2O_CONFIG_OLD_IOCTL is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -1254,6 +1262,7 @@
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=m
 CONFIG_EXT3_FS_SECURITY=y
 CONFIG_JBD=m
@@ -1282,6 +1291,7 @@
 CONFIG_JFFS_PROC_FS=y
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
 # CONFIG_JFFS2_FS_NAND is not set
 CONFIG_JFFS2_FS_NOR_ECC=y
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
@@ -1362,6 +1372,7 @@
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_FS is not set
+# CONFIG_KPROBES is not set
 CONFIG_IA64_GRANULE_16MB=y
 # CONFIG_IA64_GRANULE_64MB is not set
 CONFIG_IA64_PRINT_HAZARDS=y

Modified: dists/trunk/linux-2.6/debian/changelog
===================================================================
--- dists/trunk/linux-2.6/debian/changelog	2005-10-05 22:07:55 UTC (rev 4310)
+++ dists/trunk/linux-2.6/debian/changelog	2005-10-05 22:21:57 UTC (rev 4311)
@@ -108,8 +108,9 @@
     John Wright is running benchmarks to determine the overhead of running
     an SMP kernel on UP systems to help decide if this should be a
     permanent change).
+  * [ia64] Update arch/ia64/config for 2.6.13
 
- -- dann frazier <dannf at debian.org>  Wed,  5 Oct 2005 15:17:05 -0600
+ -- dann frazier <dannf at debian.org>  Wed,  5 Oct 2005 16:22:59 -0600
 
 linux-2.6 (2.6.12-6) unstable; urgency=high