diff --git a/[refs] b/[refs] index f8bb2c4aacab..d237c67a34fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d0d37cfb8039939f51dd2a1da98aff3b50a4e84 +refs/heads/master: f9a4ddc72107a30a2999d717479efd93689a54bb diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile index 199060e588dc..75b201b56074 100644 --- a/trunk/arch/i386/kernel/Makefile +++ b/trunk/arch/i386/kernel/Makefile @@ -33,7 +33,7 @@ obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_MODULES) += module.o obj-y += sysenter.o vsyscall.o obj-$(CONFIG_ACPI_SRAT) += srat_32.o -obj-$(CONFIG_EFI) += efi.o efi_stub_32.o +obj-$(CONFIG_EFI) += efi_32.o efi_stub_32.o obj-$(CONFIG_DOUBLEFAULT) += doublefault.o obj-$(CONFIG_VM86) += vm86_32.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o diff --git a/trunk/arch/i386/kernel/efi.c b/trunk/arch/i386/kernel/efi_32.c similarity index 100% rename from trunk/arch/i386/kernel/efi.c rename to trunk/arch/i386/kernel/efi_32.c