[Xen-changelog] [linux-2.6.18-xen] ia64/xen: Fix the build after x86 acpi changes.

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1207431698 -3600
# Node ID 10b69cd7ac53f14aaf49564bd53c6571dad30608
# Parent  b61443b1bf7690f421dbdfbcd62cf83497deb4a0
ia64/xen: Fix the build after x86 acpi changes.

Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---
 drivers/acpi/hardware/hwsleep.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r b61443b1bf76 -r 10b69cd7ac53 drivers/acpi/hardware/hwsleep.c
--- a/drivers/acpi/hardware/hwsleep.c   Sat Apr 05 22:36:49 2008 +0100
+++ b/drivers/acpi/hardware/hwsleep.c   Sat Apr 05 22:41:38 2008 +0100
@@ -227,7 +227,7 @@ acpi_status asmlinkage acpi_enter_sleep_
        u32 PM1Bcontrol;
        struct acpi_bit_register_info *sleep_type_reg_info;
        struct acpi_bit_register_info *sleep_enable_reg_info;
-#ifndef CONFIG_XEN
+#if !(defined(CONFIG_XEN) && defined(CONFIG_X86))
        u32 in_value;
 #else
        int err;
@@ -331,7 +331,7 @@ acpi_status asmlinkage acpi_enter_sleep_
 
        ACPI_FLUSH_CPU_CACHE();
 
-#ifndef CONFIG_XEN
+#if !(defined(CONFIG_XEN) && defined(CONFIG_X86))
        status = acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
                                        ACPI_REGISTER_PM1A_CONTROL,
                                        PM1Acontrol);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog