projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
init
/
main.c
diff --git
a/init/main.c
b/init/main.c
index 4870dfeb9ee57798abd057eb74a5ac11497ff097..2c5ade79eb81718702dd1fdf44e8b129e69f88a9 100644
(file)
--- a/
init/main.c
+++ b/
init/main.c
@@
-24,6
+24,7
@@
#include <linux/smp_lock.h>
#include <linux/initrd.h>
#include <linux/bootmem.h>
#include <linux/smp_lock.h>
#include <linux/initrd.h>
#include <linux/bootmem.h>
+#include <linux/acpi.h>
#include <linux/tty.h>
#include <linux/gfp.h>
#include <linux/percpu.h>
#include <linux/tty.h>
#include <linux/gfp.h>
#include <linux/percpu.h>
@@
-88,11
+89,6
@@
extern void sbus_init(void);
extern void prio_tree_init(void);
extern void radix_tree_init(void);
extern void free_initmem(void);
extern void prio_tree_init(void);
extern void radix_tree_init(void);
extern void free_initmem(void);
-#ifdef CONFIG_ACPI
-extern void acpi_early_init(void);
-#else
-static inline void acpi_early_init(void) { }
-#endif
#ifndef CONFIG_DEBUG_RODATA
static inline void mark_rodata_ro(void) { }
#endif
#ifndef CONFIG_DEBUG_RODATA
static inline void mark_rodata_ro(void) { }
#endif