summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'tags/2.6.20-5/23000-linux-2.6-acpi-config_pm-poweroff.patch')
-rw-r--r--tags/2.6.20-5/23000-linux-2.6-acpi-config_pm-poweroff.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/tags/2.6.20-5/23000-linux-2.6-acpi-config_pm-poweroff.patch b/tags/2.6.20-5/23000-linux-2.6-acpi-config_pm-poweroff.patch
new file mode 100644
index 0000000..e925785
--- /dev/null
+++ b/tags/2.6.20-5/23000-linux-2.6-acpi-config_pm-poweroff.patch
@@ -0,0 +1,38 @@
+See http://bugzilla.redhat.com/241381
+
+From b7da11fc422b5d06ab6ed5444a1f01ac0e805c74 Mon Sep 17 00:00:00 2001
+From: Eduardo Habkost <ehabkost@redhat.com>
+Date: Tue, 10 Jul 2007 19:02:14 -0300
+Subject: [PATCH] Remove #ifdef CONFIG_PM from ACPI power-off code
+
+The ACPI poweroff code is inside a #ifdef CONFIG_PM, that was added on
+commit b35c67a46b025e8dc320b59fbe5c283094e1d7f5. It is not necessary
+because the poweroff code compiles and works even with CONFIG_PM disabled.
+
+Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
+---
+ drivers/acpi/sleep/poweroff.c | 4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/acpi/sleep/poweroff.c b/drivers/acpi/sleep/poweroff.c
+index d9801ef..5d6ba10 100644
+--- a/drivers/acpi/sleep/poweroff.c
++++ b/drivers/acpi/sleep/poweroff.c
+@@ -37,8 +37,6 @@ #endif
+ return 0;
+ }
+
+-#ifdef CONFIG_PM
+-
+ void acpi_power_off(void)
+ {
+ /* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */
+@@ -94,5 +92,3 @@ static int acpi_poweroff_init(void)
+ }
+
+ late_initcall(acpi_poweroff_init);
+-
+-#endif /* CONFIG_PM */
+--
+silverbrick.install.2006.08.14-dirty
+