This is fixing an obvious emission.
--Marcin
--------------1EEEF2B7838953EECE26A624
Content-Type: text/plain; charset=iso-8859-2;
name="diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="diff"
diff -ur linux/arch/i386/kernel/apm.c linux-2.3.26/arch/i386/kernel/apm.c
--- linux/arch/i386/kernel/apm.c Sun Nov 7 20:02:18 1999
+++ linux-2.3.26/arch/i386/kernel/apm.c Sun Nov 7 19:22:19 1999
@@ -1367,8 +1367,10 @@
/* Install our power off handler.. */
if (power_off_enabled)
acpi_power_off = apm_power_off;
- sysrq_power_off = apm_power_off;
+#ifdef CONFIG_MAGIC_SYSRQ
+ sysrq_power_off = apm_power_off;
+#endif
apm_mainloop();
return 0;
}
--------------1EEEF2B7838953EECE26A624--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/