From df9349aaaccdd876f2986e7a9822d44a89cc0097 Mon Sep 17 00:00:00 2001
From: dann frazier <dannf@debian.org>
Date: Sun, 11 Dec 2005 19:29:01 +0000
Subject: [PATCH] * Update ia64 configs

svn path=/dists/trunk/linux-2.6/; revision=5001
---
 debian/arch/ia64/config | 11 +++++++++--
 debian/changelog        |  6 ++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config
index c518cba72..f652fc7e7 100644
--- a/debian/arch/ia64/config
+++ b/debian/arch/ia64/config
@@ -24,6 +24,8 @@ CONFIG_IA64_GENERIC=y
 # CONFIG_IA64_PAGE_SIZE_8KB is not set
 CONFIG_IA64_PAGE_SIZE_16KB=y
 # CONFIG_IA64_PAGE_SIZE_64KB is not set
+CONFIG_PGTABLE_3=y
+# CONFIG_PGTABLE_4 is not set
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 # CONFIG_HZ_1000 is not set
@@ -33,8 +35,12 @@ CONFIG_HOLES_IN_ZONE=y
 CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
 # CONFIG_IA64_CYCLONE is not set
 CONFIG_IOSAPIC=y
-# CONFIG_IA64_SGI_SN_XP is not set
-CONFIG_FORCE_MAX_ZONEORDER=18
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_FLATMEM_MANUAL is not set
+CONFIG_DISCONTIGMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_IA64_SGI_SN_XP=m
+CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_IA32_SUPPORT=y
 CONFIG_COMPAT=y
 CONFIG_IA64_MCA_RECOVERY=m
@@ -44,6 +50,7 @@ CONFIG_ACPI_DEALLOCATE_IRQ=y
 CONFIG_EFI_VARS=m
 CONFIG_EFI_PCDP=y
 CONFIG_PM=y
+CONFIG_PM_LEGACY=y
 CONFIG_ACPI=y
 CONFIG_ACPI_BOOT=y
 CONFIG_ACPI_INTERPRETER=y
diff --git a/debian/changelog b/debian/changelog
index 8735af0fc..ec55fcba3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux-2.6 (2.6.14+2.6.15-rc5-0experimental.2) UNRELEASED; urgency=low
+
+  * Update ia64 configs
+
+ -- dann frazier <dannf@debian.org>  Sun, 11 Dec 2005 12:27:13 -0700
+
 linux-2.6 (2.6.14+2.6.15-rc5-0experimental.1) experimental; urgency=low
 
   * New upstream release candidate.