Merge branches 'acpi-processor' and 'acpi-pad'

[karo-tx-linux.git] / arch / ia64 / include / asm / acpi.h

diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h
index b47821931ca615c735e66118953cae7a364767b0..2e73dffa16af2ef69e30e9d5bb602442d9b34eb1 100644 (file)
--- a/arch/ia64/include/asm/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@ -93,7 +93,6 @@ extern int acpi_lapic;
 #endif
 #define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */
 static inline void disable_acpi(void) { }
-static inline void pci_acpi_crs_quirks(void) { }
 
 #ifdef CONFIG_IA64_GENERIC
 const char *acpi_get_sysname (void);