Re: 2.6.12-rc5-git3 fails compile -- acpi_boot_table_init

[Christian Kujau <evil@g-house.de>]

Steven Cole wrote:
> I had to fix up one reject, but it still fixes the no ACPI build for me, 
> with the current HEAD=5e485b7975472ba4a408523deb6541e70c451842.

hm, i still had 2 rejects with your patch, -git tree updated today.
another "version" of patch attached, and yes: it does fix the no-ACPI build.

thanks,
Christian.

Signed-off-by: Christian Kujau <evil@g-house.de>

--- linux-2.6-git/include/linux/acpi.h.orig     2005-05-31 
21:49:00.411776244 +0200
+++ linux-2.6-git/include/linux/acpi.h  2005-05-31 21:51:30.855399473 +0200
@@ -415,16 +415,6 @@

 #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);
@@ -535,5 +525,17 @@

 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*/
--
BOFH excuse #291:

Due to the CDA, we no longer have a root account.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/