[kernel] r5531 - dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches

[Martin Michlmayr]

Author: tbm
Date: Fri Jan 20 19:40:44 2006
New Revision: 5531

Modified:
   dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/67_check_nonzero_funpoint.dpatch
Log:
I was mixing two merges, but we only got one in our tree...


Modified: dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/67_check_nonzero_funpoint.dpatch
==============================================================================
--- dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/67_check_nonzero_funpoint.dpatch	(original)
+++ dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/67_check_nonzero_funpoint.dpatch	Fri Jan 20 19:40:44 2006
@@ -59,8 +59,8 @@
  void machine_power_off(void)
  {
 -	_machine_power_off();
-+	if (pm_power_off)
-+		pm_power_off();
++	if (_machine_power_off)
++		_machine_power_off();
  }
 -