Commit 752b4f67 authored by Linus Torvalds's avatar Linus Torvalds

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

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 6a8be6b5 e73cd7c9
...@@ -96,7 +96,7 @@ extern void prepare_namespace(void); ...@@ -96,7 +96,7 @@ extern void prepare_namespace(void);
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
extern void acpi_early_init(void); extern void acpi_early_init(void);
#else #else
static inline acpi_early_init() { } static inline void acpi_early_init(void) { }
#endif #endif
#ifdef CONFIG_TC #ifdef CONFIG_TC
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment