r4653 - in dists/trunk/linux-2.6/debian: . arch/alpha

[Norbert Tretkowski]

Author: nobse
Date: 2005-10-25 18:53:17 +0000 (Tue, 25 Oct 2005)
New Revision: 4653

Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/config
   dists/trunk/linux-2.6/debian/arch/alpha/config.alpha-smp
   dists/trunk/linux-2.6/debian/changelog
Log:
Update arch/alpha/config* for 2.6.14.


Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config	2005-10-25 06:36:12 UTC (rev 4652)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config	2005-10-25 18:53:17 UTC (rev 4653)
@@ -210,6 +210,7 @@
 CONFIG_BLK_DEV_IDEFLOPPY=m
 CONFIG_IDE_TASK_IOCTL=y
 CONFIG_IDE_GENERIC=m
+# CONFIG_BLK_DEV_IDEPNP is not set
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
 # CONFIG_BLK_DEV_OFFBOARD is not set

Modified: dists/trunk/linux-2.6/debian/arch/alpha/config.alpha-smp
===================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config.alpha-smp	2005-10-25 06:36:12 UTC (rev 4652)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config.alpha-smp	2005-10-25 18:53:17 UTC (rev 4653)
@@ -6,3 +6,5 @@
 CONFIG_NR_CPUS=64
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_MATHEMU=y
+CONFIG_MKISS=m
+# CONFIG_DIGIEPCA is not set

Modified: dists/trunk/linux-2.6/debian/changelog
===================================================================
--- dists/trunk/linux-2.6/debian/changelog	2005-10-25 06:36:12 UTC (rev 4652)
+++ dists/trunk/linux-2.6/debian/changelog	2005-10-25 18:53:17 UTC (rev 4653)
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.13+2.6.14-rc5-0experimental.2) UNRELEASED; urgency=low
+
+  [ Norbert Tretkowski ]
+  * [alpha] Update arch/alpha/config* for 2.6.14.
+
+ -- Norbert Tretkowski <nobse at debian.org>  Tue, 25 Oct 2005 20:33:25 +0200
+
 linux-2.6 (2.6.13+2.6.14-rc5-0experimental.1) experimental; urgency=low
 
   [ Sven Luther ]
@@ -50,7 +57,7 @@
     popular demand. (closes: #330916)
 
   [ Norbert Tretkowski ]
-  * [alpha] Update arch/alpha/config for 2.6.13
+  * [alpha] Update arch/alpha/config for 2.6.13.
 
   [ Kyle McMartin ]
   * [hppa] Oops. Fix linux-headers not including asm-parisc by adding