tree 6cde6659eef13063c6408df2e81dd3a8af60e787
parent 14454a1b3ff8d1d15fbe7cc77f27373777184ddf
author Andrew Morton <[EMAIL PROTECTED]> Sat, 30 Jul 2005 12:18:00 -0400
committer Len Brown <[EMAIL PROTECTED]> Fri, 05 Aug 2005 06:27:11 -0400
[ACPI] CONFIG_ACPI=n build fix
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Len Brown <[EMAIL PROTECTED]>
include/linux/acpi.h | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -420,16 +420,6 @@ extern int sbf_port ;
#define acpi_mp_config 0
-static inline int acpi_boot_init(void)
-{
- return 0;
-}
-
-static inline int acpi_boot_table_init(void)
-{
- return 0;
-}
-
#endif /*!CONFIG_ACPI_BOOT*/
int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low);
@@ -536,5 +526,17 @@ static inline int acpi_get_pxm(acpi_hand
extern int pnpacpi_disabled;
+#else /* CONFIG_ACPI */
+
+static inline int acpi_boot_init(void)
+{
+ return 0;
+}
+
+static inline int acpi_boot_table_init(void)
+{
+ return 0;
+}
+
#endif /* CONFIG_ACPI */
#endif /*_LINUX_ACPI_H*/
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
