From 344541eda8e07c3daf79bc60b31be15509cccc57 Mon Sep 17 00:00:00 2001
From: Bob Moore <robert.moore@intel.com>
Date: Wed, 18 Feb 2009 14:52:43 +0800
Subject: [PATCH] --- yaml --- r: 141847 b: refs/heads/master c:
 4f70e371cdf6ab4f988fbaf2257e6259422ba662 h: refs/heads/master i:   141845:
 96da6b62e248300ce3b0235192cc35f1054b94a8   141843:
 63a1f73e1508a3adc18e0af843ea01e88cde5131   141839:
 e6e443aecaf899ed2742e330867fc15375947a80 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/acpi/acpica/hwsleep.c | 5 ++++-
 trunk/include/acpi/acpixf.h         | 8 ++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index ebf5cbdcda04..95d73deba6e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3371c19c294a4cb3649aa4e84606be8a1d999e61
+refs/heads/master: 4f70e371cdf6ab4f988fbaf2257e6259422ba662
diff --git a/trunk/drivers/acpi/acpica/hwsleep.c b/trunk/drivers/acpi/acpica/hwsleep.c
index 51868f48159c..26e249e69ead 100644
--- a/trunk/drivers/acpi/acpica/hwsleep.c
+++ b/trunk/drivers/acpi/acpica/hwsleep.c
@@ -90,6 +90,7 @@ acpi_set_firmware_waking_vector(u32 physical_address)
 
 ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector)
 
+#if ACPI_MACHINE_WIDTH == 64
 /*******************************************************************************
  *
  * FUNCTION:    acpi_set_firmware_waking_vector64
@@ -100,7 +101,8 @@ ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector)
  * RETURN:      Status
  *
  * DESCRIPTION: Sets the 64-bit X_firmware_waking_vector field of the FACS, if
- *              it exists in the table.
+ *              it exists in the table. This function is intended for use with
+ *              64-bit host operating systems.
  *
  ******************************************************************************/
 acpi_status
@@ -124,6 +126,7 @@ acpi_set_firmware_waking_vector64(u64 physical_address)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector64)
+#endif
 
 /*******************************************************************************
  *
diff --git a/trunk/include/acpi/acpixf.h b/trunk/include/acpi/acpixf.h
index 8f9df6235255..e10c89691043 100644
--- a/trunk/include/acpi/acpixf.h
+++ b/trunk/include/acpi/acpixf.h
@@ -351,11 +351,11 @@ acpi_status acpi_get_register_unlocked(u32 register_id, u32 *return_value);
 
 acpi_status acpi_set_register(u32 register_id, u32 value);
 
-acpi_status
-acpi_set_firmware_waking_vector(u32 physical_address);
+acpi_status acpi_set_firmware_waking_vector(u32 physical_address);
 
-acpi_status
-acpi_set_firmware_waking_vector64(u64 physical_address);
+#if ACPI_MACHINE_WIDTH == 64
+acpi_status acpi_set_firmware_waking_vector64(u64 physical_address);
+#endif
 
 acpi_status acpi_read(u32 *value, struct acpi_generic_address *reg);