Re: 2.6.12-rc2-mm1: ACPI=y, ACPI_BOOT=n problems

[Andrew Morton <akpm@osdl.org>]

Steven Cole <elenstev@mesatop.com> wrote:
>
> arch/i386/kernel/setup.c: In function 'setup_arch':
>  arch/i386/kernel/setup.c:1571: warning: implicit declaration of function 'acpi_boot_table_init'
>  arch/i386/kernel/setup.c:1572: warning: implicit declaration of function 'acpi_boot_init'


diff -puN include/linux/acpi.h~no-acpi-build-fix include/linux/acpi.h
--- 25/include/linux/acpi.h~no-acpi-build-fix	2005-04-05 00:14:46.000000000 -0700
+++ 25-akpm/include/linux/acpi.h	2005-04-05 00:23:39.000000000 -0700
@@ -418,16 +418,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*/
 
 unsigned int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low);
@@ -538,5 +528,18 @@ 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 */
_