[kernel] r5386 - in dists/trunk/linux-2.6/debian: . patches

[Bastian Blank]

Author: waldi
Date: Tue Jan 10 11:05:24 2006
New Revision: 5386

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/hppa-incompatible.patch
Log:
* debian/changelog: Update.
* debian/patches/hppa-incompatible.patch: Fix to apply again.


Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Jan 10 11:05:24 2006
@@ -23,9 +23,11 @@
 
   [ 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 at sternwelten.at>  Mon,  9 Jan 2006 23:21:22 +0100
+ -- Bastian Blank <waldi at debian.org>  Tue, 10 Jan 2006 11:58:55 +0000
 
 linux-2.6 (2.6.15-1) unstable; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/patches/hppa-incompatible.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/hppa-incompatible.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/hppa-incompatible.patch	Tue Jan 10 11:05:24 2006
@@ -8984,13 +8984,13 @@
 -	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;
 -		}
 -	}