[kernel] r8036 - in dists/sid/linux-2.6/debian: . arch/ia64

[Dann Frazier]

Author: dannf
Date: Sun Dec 24 19:17:54 2006
New Revision: 8036

Modified:
   dists/sid/linux-2.6/debian/arch/ia64/config
   dists/sid/linux-2.6/debian/changelog
Log:
* ia64: turn on IOC4 modules for SGI Altix systems. Thanks to Stephane Larose
  for suggesting this.

Modified: dists/sid/linux-2.6/debian/arch/ia64/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/ia64/config	(original)
+++ dists/sid/linux-2.6/debian/arch/ia64/config	Sun Dec 24 19:17:54 2006
@@ -237,6 +237,7 @@
 # CONFIG_PDC202XX_FORCE is not set
 CONFIG_BLK_DEV_SVWKS=m
 CONFIG_BLK_DEV_SGIIOC4=m
+CONFIG_BLK_DEV_SGIIOC3=m
 CONFIG_BLK_DEV_SIIMAGE=m
 CONFIG_BLK_DEV_SLC90E66=m
 CONFIG_BLK_DEV_TRM290=m
@@ -661,6 +662,7 @@
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_SGI_L1_CONSOLE=y
 CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SGI_IOC4=m
 CONFIG_SERIAL_SGI_IOC3=m
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
@@ -692,7 +694,7 @@
 # CONFIG_HPET is not set
 CONFIG_MAX_RAW_DEVS=256
 CONFIG_HANGCHECK_TIMER=m
-# CONFIG_MMTIMER is not set
+CONFIG_MMTIMER=m
 CONFIG_I2C=m
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_ALGOBIT=m
@@ -1129,6 +1131,7 @@
 CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_IPOIB=m
+CONFIG_SGI_IOC4=m
 CONFIG_SGI_IOC3=m
 CONFIG_JBD=m
 CONFIG_FS_MBCACHE=m

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sun Dec 24 19:17:54 2006
@@ -32,6 +32,8 @@
       h->cciss_read/h->cciss_write that caused command timeouts on older
       controllers on ia32 (closes: #402787)
   * Fix mincore hang (CVE-2006-4814)
+  * ia64: turn on IOC4 modules for SGI Altix systems. Thanks to Stephane Larose
+    for suggesting this.
 
   [ Norbert Tretkowski ]
   * libata: handle 0xff status properly. (closes: #391867)
@@ -42,7 +44,7 @@
   * m68k/atari: enable keyboard, mouse and fb drivers
   * m68k/atari: fixes for ethernec and video driver by Michael Schmitz
 
- -- dann frazier <dannf at debian.org>  Thu, 21 Dec 2006 14:34:01 -0700
+ -- dann frazier <dannf at debian.org>  Sun, 24 Dec 2006 11:11:31 -0700
 
 linux-2.6 (2.6.18-8) unstable; urgency=low