Merge bk://linux-acpi.bkbits.net/linux-acpi-release-2.6.8

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://linux-acpi.bkbits.net/linux-acpi-release-2.6.8
into ppc970.osdl.org:/home/torvalds/v2.6/linux
752b4f67 · Linus Torvalds · 6a8be6b5 · e73cd7c9 · 752b4f67
Commit 752b4f67 authored Aug 21, 2004 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

init/main.c init/main.c +1 -1

No files found.
--- a/init/main.c
+++ b/init/main.c
@@ -96,7 +96,7 @@ extern void prepare_namespace(void);
 #ifdef	CONFIG_ACPI
 extern void acpi_early_init(void);
 #else
-static inline acpi_early_init() { }
+static inline void acpi_early_init(void) { }
 #endif
 #ifdef CONFIG_TC