lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'acerhdf', 'acpi-pci-bind', 'bjorn-pci-root', 'bugzilla-12904', 'bugzilla-13121', 'bugzilla-13396', 'bugzilla-13533', 'bugzilla-13612', 'c3_lock', 'hid-cleanups', 'misc-2.6.31', 'pdc-leak-fix', 'pnpacpi', 'power_nocheck', 'thinkpad_acpi', 'video' and 'wmi' into release

Browse Source
This commit is contained in:
Len Brown
2009-06-24 01:19:50 -04:00
parent 4e8a2372f9 e86435eb91 7fe2a6c275 0705495d90 35a7c64fbc 152a4e630f 86e437f077 c8d72a5e76 7a04b8491a ee1ca48fae 9eccbc2f67 7e275cc4e8 7b768f07dc 8cb24c8fd7 113b3a2b90 d73772474f 056c308d3e 871043bc46
commit fbe8cddd2d
39 changed files with 1708 additions and 851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
init/main.c
View File

@ -24,6 +24,7 @@
#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>
@ -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);
#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