Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.7

into intel.com:/home/lenb/src/linux-acpi-test-2.6.8

Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.7
into intel.com:/home/lenb/src/linux-acpi-test-2.6.8
ac500e06 · Len Brown · e231c6ea · aab2ca43 · ac500e06
Commit ac500e06 authored Aug 14, 2004 by Len Brown
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