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

* debian/changelog: Update. 

* debian/patches/hppa-incompatible.patch: Fix to apply again.

svn path=/dists/trunk/linux-2.6/; revision=5386
This commit is contained in:
Bastian Blank 2006-01-10 11:05:24 +00:00
parent 21fc092143
commit 1655f110ca
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -23,9 +23,11 @@ linux-2.6 (2.6.15-2) UNRELEASED; urgency=low
[ Bastian Blank ]
* Remove pre-sarge conflict with hotplug.
* Fix hppa diff to apply.
* Make the latest packages depend on the corect version of the real images.
(closes: #346366)
-- maximilian attems <maks@sternwelten.at> Mon, 9 Jan 2006 23:21:22 +0100
-- Bastian Blank <waldi@debian.org> Tue, 10 Jan 2006 11:58:55 +0000
linux-2.6 (2.6.15-1) unstable; urgency=low

4
debian/patches/hppa-incompatible.patch vendored
View File

@ -8984,13 +8984,13 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
- if (! integrated) {
- if ((opl3->res_l_port = request_region(l_port, 2, "OPL2/3 (left)")) == NULL) {
- snd_printk(KERN_ERR "opl3: can't grab left port 0x%lx\n", l_port);
- snd_opl3_free(opl3);
- snd_device_free(card, opl3);
- return -EBUSY;
- }
- if (r_port != 0 &&
- (opl3->res_r_port = request_region(r_port, 2, "OPL2/3 (right)")) == NULL) {
- snd_printk(KERN_ERR "opl3: can't grab right port 0x%lx\n", r_port);
- snd_opl3_free(opl3);
- snd_device_free(card, opl3);
- return -EBUSY;
- }
- }