---

yaml --- r: 79993 b: refs/heads/master c: 5b83683 h: refs/heads/master i: 79991: 5c66e82 v: v3
git-mirror · Jan 30, 2008 · dd8836e · dd8836e
1 parent 7409771
commit dd8836e
Show file tree

Hide file tree

Showing 10 changed files with 848 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c8b8859b64baf6d7c33900e8720c7bafe775b2c
+refs/heads/master: 5b83683f32b113d07edfb67a33ce389fc624423d
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
@@ -959,7 +959,7 @@ config MTRR
 config EFI
 	def_bool n
 	prompt "Boot from EFI support"
-	depends on X86_32 && ACPI
+	depends on ACPI
 	---help---
 	This enables the kernel to boot on EFI platforms using
 	system configuration information passed to it from the firmware.

diff --git a/trunk/arch/x86/kernel/Makefile_64 b/trunk/arch/x86/kernel/Makefile_64
@@ -39,6 +39,7 @@ obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer_64.o
 obj-$(CONFIG_X86_VSMP)		+= vsmp_64.o
 obj-$(CONFIG_K8_NB)		+= k8.o
 obj-$(CONFIG_AUDIT)		+= audit_64.o
+obj-$(CONFIG_EFI)		+= efi.o efi_64.o efi_stub_64.o
 
 obj-$(CONFIG_MODULES)		+= module_64.o
 obj-$(CONFIG_PCI)		+= early-quirks.o