diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 09:34:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 09:34:07 -0700 |
| commit | 746942d06acdb4dd78d16baa5f3728a48a033bdd (patch) | |
| tree | 1470ffab015f6b7c2ff6f44314f9fab17d3a4c3f /init | |
| parent | c11f6c82581e8be4e1829c677db54e7f55cebece (diff) | |
| parent | c602c65b2f81d14456771d1e3f15d1381f4b7efa (diff) | |
| download | linux-746942d06acdb4dd78d16baa5f3728a48a033bdd.tar.gz linux-746942d06acdb4dd78d16baa5f3728a48a033bdd.tar.bz2 linux-746942d06acdb4dd78d16baa5f3728a48a033bdd.zip | |
Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6
* 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6:
SFI: remove unneeded includes
sfi: Remove unused code
SFI: Hook PCI MMCONFIG
x86: add arch-specific SFI support
SFI: add capability to parse ACPI tables
SFI: add platform-independent core support
SFI: create linux/sfi.h
SFI: Simple Firmware Interface - MAINTAINERS, Kconfig
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index 2c48c3153163..6107223124e4 100644 --- a/init/main.c +++ b/init/main.c @@ -68,6 +68,7 @@ #include <linux/async.h> #include <linux/kmemcheck.h> #include <linux/kmemtrace.h> +#include <linux/sfi.h> #include <linux/shmem_fs.h> #include <trace/boot.h> @@ -689,6 +690,7 @@ asmlinkage void __init start_kernel(void) check_bugs(); acpi_early_init(); /* before LAPIC and SMP init */ + sfi_init_late(); ftrace_init(); |