ia64: Rename efi_get_time() in the simulator's firmware-emulator to avoid

	name-clash with declaration of routine of the same name in
	<linux/efi.h>.

diff --git a/arch/ia64/hp/sim/boot/fw-emu.c b/arch/ia64/hp/sim/boot/fw-emu.c
index 95d71afbd2793096899be142ead17853de28930a..5c46928e3dc655739bf0081ce19f503848930054 100644 (file)
--- a/arch/ia64/hp/sim/boot/fw-emu.c
+++ b/arch/ia64/hp/sim/boot/fw-emu.c
@@ -108,7 +108,7 @@ extern void pal_emulator_static (void);
 #define BUS_NUMBER(addr)       (0x0000000000FF0000 & (addr))
 
 static efi_status_t
-efi_get_time (efi_time_t *tm, efi_time_cap_t *tc)
+fw_efi_get_time (efi_time_t *tm, efi_time_cap_t *tc)
 {
 #if defined(CONFIG_IA64_HP_SIM) || defined(CONFIG_IA64_GENERIC)
        struct {
@@ -310,7 +310,7 @@ sys_fw_init (const char *args, int arglen)
        efi_runtime->hdr.signature = EFI_RUNTIME_SERVICES_SIGNATURE;
        efi_runtime->hdr.revision = EFI_RUNTIME_SERVICES_REVISION;
        efi_runtime->hdr.headersize = sizeof(efi_runtime->hdr);
-       efi_runtime->get_time = __pa(&efi_get_time);
+       efi_runtime->get_time = __pa(&fw_efi_get_time);
        efi_runtime->set_time = __pa(&efi_unimplemented);
        efi_runtime->get_wakeup_time = __pa(&efi_unimplemented);
        efi_runtime->set_wakeup_time = __pa(&efi_unimplemented);