[kernel] r6298 - in dists/trunk/linux-2.6: . debian debian/arch/arm debian/patches

[Bastian Blank]

Author: waldi
Date: Mon Mar 27 19:25:48 2006
New Revision: 6298

Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/mips-sb1-duart.patch
Log:
Merge /dists/sid/linux-2.6.


Modified: dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	Mon Mar 27 19:25:48 2006
@@ -439,7 +439,7 @@
 # CONFIG_BLK_DEV_IDE_SATA is not set
 CONFIG_BLK_DEV_IDEDISK=y
 CONFIG_IDEDISK_MULTI_MODE=y
-# CONFIG_BLK_DEV_IDECD is not set
+CONFIG_BLK_DEV_IDECD=m
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI 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	Mon Mar 27 19:25:48 2006
@@ -4,7 +4,7 @@
 
  -- Bastian Blank <waldi at debian.org>  Thu, 23 Mar 2006 21:40:17 +0100
 
-linux-2.6 (2.6.16-3) UNRELEASED; urgency=low
+linux-2.6 (2.6.16-3) unstable; urgency=low
 
   [ Frederik Schüler ]
   * [amd64] Add asm-i386 to the linux-headers packages.
@@ -17,12 +17,16 @@
   [ Martin Michlmayr ]
   * [arm/armeb] Enable CONFIG_NFSD on NSLU2 again.  Closes: #358709.
   * [arm/footbridge] CONFIG_NE2K_PCI should be a module, not built-in.
+  * [arm/footbridge] Enable CONFIG_BLK_DEV_IDECD=m since the CATS can
+    have a CD-ROM drive.
+  * [mips/sb1*] Use ttyS rather than duart as the name for the serial
+    console since the latter causes problems with debian-installer.
 
   [ Bastian Blank ]
   * Update vserver patch to 2.0.2-rc14.
     - Fix sendfile. (closes: #358391, #358752)
 
- -- Bastian Blank <waldi at debian.org>  Fri, 24 Mar 2006 12:49:46 +0100
+ -- Bastian Blank <waldi at debian.org>  Mon, 27 Mar 2006 16:08:20 +0200
 
 linux-2.6 (2.6.16-2) unstable; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/patches/mips-sb1-duart.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/mips-sb1-duart.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/mips-sb1-duart.patch	Mon Mar 27 19:25:48 2006
@@ -812,8 +812,8 @@
 +		return -ENOMEM;
 +
 +	sb1250_duart_driver->owner = THIS_MODULE;
-+	sb1250_duart_driver->name = "duart";
-+	sb1250_duart_driver->devfs_name = "duart/";
++	sb1250_duart_driver->name = "ttyS";
++	sb1250_duart_driver->devfs_name = "tts/";
 +	sb1250_duart_driver->major = TTY_MAJOR;
 +	sb1250_duart_driver->minor_start = SB1250_DUART_MINOR_BASE;
 +	sb1250_duart_driver->type            = TTY_DRIVER_TYPE_SERIAL;