aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/ia64/include/asm/acpi.h1
-rw-r--r--include/acpi/acpi_drivers.h5
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h
index d651102a4d45..97cb16086314 100644
--- a/arch/ia64/include/asm/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@ -92,7 +92,6 @@ ia64_acpi_release_global_lock (unsigned int *lock)
92#endif 92#endif
93#define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */ 93#define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */
94static inline void disable_acpi(void) { } 94static inline void disable_acpi(void) { }
95static inline void pci_acpi_crs_quirks(void) { }
96 95
97#ifdef CONFIG_IA64_GENERIC 96#ifdef CONFIG_IA64_GENERIC
98const char *acpi_get_sysname (void); 97const char *acpi_get_sysname (void);
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index d504613bbf80..ea6428b7dacb 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -96,7 +96,12 @@ struct pci_dev *acpi_get_pci_dev(acpi_handle);
96/* Arch-defined function to add a bus to the system */ 96/* Arch-defined function to add a bus to the system */
97 97
98struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root); 98struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root);
99
100#ifdef CONFIG_X86
99void pci_acpi_crs_quirks(void); 101void pci_acpi_crs_quirks(void);
102#else
103static inline void pci_acpi_crs_quirks(void) { }
104#endif
100 105
101/* -------------------------------------------------------------------------- 106/* --------------------------------------------------------------------------
102 Processor 107 Processor