From e4d031ccccefe5aabe6b564792f33320b21de10a Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Mon, 27 Mar 2006 19:25:48 +0000 Subject: [PATCH] Merge /dists/sid/linux-2.6. svn path=/dists/trunk/linux-2.6/; revision=6298 --- debian/arch/arm/config.footbridge | 2 +- debian/changelog | 8 ++++++-- debian/patches/mips-sb1-duart.patch | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index 02a36f465..87a0f530b 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -439,7 +439,7 @@ CONFIG_BLK_DEV_IDE=y # 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 diff --git a/debian/changelog b/debian/changelog index 8999c43d9..73c7ddb2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ linux-2.6 (2.6.16-99experimental.1) UNRELEASED; urgency=low -- Bastian Blank 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 @@ linux-2.6 (2.6.16-3) UNRELEASED; urgency=low [ 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 Fri, 24 Mar 2006 12:49:46 +0100 + -- Bastian Blank Mon, 27 Mar 2006 16:08:20 +0200 linux-2.6 (2.6.16-2) unstable; urgency=low diff --git a/debian/patches/mips-sb1-duart.patch b/debian/patches/mips-sb1-duart.patch index 00cba6f0e..20932678f 100644 --- a/debian/patches/mips-sb1-duart.patch +++ b/debian/patches/mips-sb1-duart.patch @@ -812,8 +812,8 @@ diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig + 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;