[kernel] r6976 - in dists/sid/linux-2.6.16/debian: .

[Dann Frazier]

Author: dannf
Date: Sun Jul  9 19:53:54 2006
New Revision: 6976

Added:
   dists/sid/linux-2.6.16/debian/arch/ia64/config.itanium
      - copied unchanged from r6967, /dists/sid/linux-2.6.16/debian/arch/ia64/config.itanium
   dists/sid/linux-2.6.16/debian/arch/ia64/config.mckinley
      - copied unchanged from r6967, /dists/sid/linux-2.6.16/debian/arch/ia64/config.mckinley
Modified:
   dists/sid/linux-2.6.16/debian/arch/ia64/defines
   dists/sid/linux-2.6.16/debian/changelog

Log:
revert r6968 - this is frozen for the next d-i beta, and the plan is to move to 2.6.17 after that

Modified: dists/sid/linux-2.6.16/debian/arch/ia64/defines
==============================================================================
--- dists/sid/linux-2.6.16/debian/arch/ia64/defines	(original)
+++ dists/sid/linux-2.6.16/debian/arch/ia64/defines	Sun Jul  9 19:53:54 2006
@@ -1,6 +1,8 @@
 [base]
 flavours:
+ itanium
  itanium-smp
+ mckinley
  mckinley-smp
 kernel-arch: ia64
 kernel-header-dirs: ia64
@@ -8,9 +10,15 @@
 [image]
 suggests: elilo, fdutils
 
+[itanium]
+class: Itanium
+
 [itanium-smp]
 class: multi-processor Itanium
 
+[mckinley]
+class: Itanium II
+
 [mckinley-smp]
 class: multi-processor Itanium II
 

Modified: dists/sid/linux-2.6.16/debian/changelog
==============================================================================
--- dists/sid/linux-2.6.16/debian/changelog	(original)
+++ dists/sid/linux-2.6.16/debian/changelog	Sun Jul  9 19:53:54 2006
@@ -1,13 +1,3 @@
-linux-2.6.16 (2.6.16-17) UNRELEASED; urgency=low
-
-  * [ia64] Drop the non-SMP flavours; they are not well maintained upstream.
-    Note that the non-SMP flavours have been identical to the SMP builds
-    since 2.6.13-1; this was to avoid having to drop then re-add these
-    flavours if upstream resolved the issue - but that never happened.
-    Note that this is a measurable performance penalty on non-SMP systems.
-
- -- dann frazier <dannf at debian.org>  Sat,  8 Jul 2006 21:16:59 -0600
-
 linux-2.6.16 (2.6.16-16) unstable; urgency=low
 
   [ Sven Luther ]