debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Merge /dists/sid/linux-2.6. 

svn path=/dists/trunk/linux-2.6/; revision=6298
This commit is contained in:
Bastian Blank 2006-03-27 19:25:48 +00:00
parent 741ad3c4f6
commit e4d031cccc
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/arch/arm/config.footbridge vendored
View File

@ -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

8
debian/changelog vendored
View File

@ -4,7 +4,7 @@ linux-2.6 (2.6.16-99experimental.1) UNRELEASED; urgency=low
-- Bastian Blank <waldi@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 @@ 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 <waldi@debian.org> Fri, 24 Mar 2006 12:49:46 +0100
-- Bastian Blank <waldi@debian.org> Mon, 27 Mar 2006 16:08:20 +0200
linux-2.6 (2.6.16-2) unstable; urgency=low

4
debian/patches/mips-sb1-duart.patch vendored
View File

@ -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;