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

[Dann Frazier]

Author: dannf
Date: 2005-10-26 20:27:03 +0000 (Wed, 26 Oct 2005)
New Revision: 4660

Modified:
   dists/trunk/linux-2.6/debian/arch/ia64/config
   dists/trunk/linux-2.6/debian/changelog
Log:
  linux-patch-debian-linux-patch-debian-X.Y.Z.
* [ia64] Disable the CONFIG_IA64_SGI_SN_XP module.  This forces
  CONFIG_GENERIC_ALLOCATOR and CONFIG_IA64_UNCACHED_ALLOCATOR to y, which
  appears to break on zx1 systems.

Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config	2005-10-26 09:59:33 UTC (rev 4659)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config	2005-10-26 20:27:03 UTC (rev 4660)
@@ -33,7 +33,7 @@
 CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
 # CONFIG_IA64_CYCLONE is not set
 CONFIG_IOSAPIC=y
-CONFIG_IA64_SGI_SN_XP=m
+# CONFIG_IA64_SGI_SN_XP is not set
 CONFIG_FORCE_MAX_ZONEORDER=18
 CONFIG_IA32_SUPPORT=y
 CONFIG_COMPAT=y

Modified: dists/trunk/linux-2.6/debian/changelog
===================================================================
--- dists/trunk/linux-2.6/debian/changelog	2005-10-26 09:59:33 UTC (rev 4659)
+++ dists/trunk/linux-2.6/debian/changelog	2005-10-26 20:27:03 UTC (rev 4660)
@@ -5,12 +5,17 @@
 
   [ Simon Horman ]
   * Fix misformatting of long description of
-    linux-patch-debian-linux-patch-debian-X.Y.Z. 
+    linux-patch-debian-linux-patch-debian-X.Y.Z.
     templates/control.main.in
     (closes: #335088)
 
- -- Simon Horman <horms at debian.org>  Wed, 26 Oct 2005 15:36:56 +0900
+  [ dann frazier ]
+  * [ia64] Disable the CONFIG_IA64_SGI_SN_XP module.  This forces
+    CONFIG_GENERIC_ALLOCATOR and CONFIG_IA64_UNCACHED_ALLOCATOR to y, which
+    appears to break on zx1 systems.
 
+ -- dann frazier <dannf at debian.org>  Wed, 26 Oct 2005 14:24:22 -0600
+
 linux-2.6 (2.6.13+2.6.14-rc5-0experimental.1) experimental; urgency=low
 
   [ Sven Luther ]