From: Kristen Accardi Fix build error when CONFIG_ACPI not defined Signed-off-by: Kristen Carlson Accardi Cc: Greg KH Signed-off-by: Andrew Morton --- include/linux/pci-acpi.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN include/linux/pci-acpi.h~fix-pciehp-compile-issue-when-config_acpi-is-not include/linux/pci-acpi.h --- devel/include/linux/pci-acpi.h~fix-pciehp-compile-issue-when-config_acpi-is-not 2006-05-13 08:30:45.000000000 -0700 +++ devel-akpm/include/linux/pci-acpi.h 2006-05-13 08:30:45.000000000 -0700 @@ -50,7 +50,7 @@ extern acpi_status pci_osc_control_set(acpi_handle handle, u32 flags); extern acpi_status pci_osc_support_set(u32 flags); #else -#if !defined(acpi_status) +#if !defined(AE_ERROR) typedef u32 acpi_status; #define AE_ERROR (acpi_status) (0x0001) #endif _