[kernel] r5154 - in dists/trunk/linux-2.6/debian: . arch/hppa

[Kyle McMartin]

Author: kyle
Date: Sat Dec 31 01:08:24 2005
New Revision: 5154

Modified:
   dists/trunk/linux-2.6/debian/arch/hppa/config
   dists/trunk/linux-2.6/debian/arch/hppa/config.parisc64
   dists/trunk/linux-2.6/debian/arch/hppa/config.parisc64-smp
   dists/trunk/linux-2.6/debian/changelog
Log:
Update configs for 2.6.15.


Modified: dists/trunk/linux-2.6/debian/arch/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config	Sat Dec 31 01:08:24 2005
@@ -961,3 +961,12 @@
 CONFIG_HZ_250=y
 # CONFIG_HZ_1000 is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_HZ=250
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_MEGARAID_MM=m
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_MEGARAID_MAILBOX=m
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SPLIT_PTLOCK_CPUS=4096

Modified: dists/trunk/linux-2.6/debian/arch/hppa/config.parisc64
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config.parisc64	(original)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config.parisc64	Sat Dec 31 01:08:24 2005
@@ -9,3 +9,5 @@
 CONFIG_COMPAT=y
 # CONFIG_NI5010 is not set
 # CONFIG_PCMCIA_XIRTULIP is not set
+CONFIG_NEED_MULTIPLE_NODES=y
+# CONFIG_FLATMEM_MANUAL is not set

Modified: dists/trunk/linux-2.6/debian/arch/hppa/config.parisc64-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config.parisc64-smp	(original)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config.parisc64-smp	Sat Dec 31 01:08:24 2005
@@ -12,3 +12,5 @@
 CONFIG_COMPAT=y
 CONFIG_NR_CPUS=32
 # CONFIG_DEBUG_RWLOCK is not set
+CONFIG_NEED_MULTIPLE_NODES=y
+# CONFIG_FLATMEM_MANUAL is not set

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Dec 31 01:08:24 2005
@@ -2,6 +2,8 @@
 
   [ Kyle McMartin ]
   * Change parisc kernel names to something less ambiguous.
+  * Snag latest hppa.diff from cvs.parisc-linux.org.
+  * Update configs for 2.6.15.
 
   [ dann frazier ]
   * Update ia64 configs