ia64/linux-2.6.18-xen.hg

changeset 516:10b69cd7ac53

ia64/xen: Fix the build after x86 acpi changes.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
author Keir Fraser <keir.fraser@citrix.com>
date Sat Apr 05 22:41:38 2008 +0100 (2008-04-05)
parents b61443b1bf76
children cf150ce22d43
files drivers/acpi/hardware/hwsleep.c
line diff
     1.1 --- a/drivers/acpi/hardware/hwsleep.c	Sat Apr 05 22:36:49 2008 +0100
     1.2 +++ b/drivers/acpi/hardware/hwsleep.c	Sat Apr 05 22:41:38 2008 +0100
     1.3 @@ -227,7 +227,7 @@ acpi_status asmlinkage acpi_enter_sleep_
     1.4  	u32 PM1Bcontrol;
     1.5  	struct acpi_bit_register_info *sleep_type_reg_info;
     1.6  	struct acpi_bit_register_info *sleep_enable_reg_info;
     1.7 -#ifndef CONFIG_XEN
     1.8 +#if !(defined(CONFIG_XEN) && defined(CONFIG_X86))
     1.9  	u32 in_value;
    1.10  #else
    1.11  	int err;
    1.12 @@ -331,7 +331,7 @@ acpi_status asmlinkage acpi_enter_sleep_
    1.13  
    1.14  	ACPI_FLUSH_CPU_CACHE();
    1.15  
    1.16 -#ifndef CONFIG_XEN
    1.17 +#if !(defined(CONFIG_XEN) && defined(CONFIG_X86))
    1.18  	status = acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
    1.19  					ACPI_REGISTER_PM1A_CONTROL,
    1.20  					PM1Acontrol);