efi_get_pal_addr() is already declared in linux/efi.h (which is already
indirectly included). This patch removes the inline declaration and
includes linux/efi.h directly for good measure.
Signed-Off-By: Horms <horms@xxxxxxxxxxxx>
---
arch/ia64/kernel/machine_kexec.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c
index 573a6b8..f30aa87 100644
--- a/arch/ia64/kernel/machine_kexec.c
+++ b/arch/ia64/kernel/machine_kexec.c
@@ -16,6 +16,7 @@ #include <linux/mm.h>
#include <linux/kexec.h>
#include <linux/pci.h>
#include <linux/cpu.h>
+#include <linux/efi.h>
#include <asm/mmu_context.h>
#include <asm/setup.h>
#include <asm/mca.h>
@@ -98,7 +99,6 @@ #endif
* Do not allocate memory (or fail in any way) in machine_kexec().
* We are past the point of no return, committed to rebooting now.
*/
-extern void *efi_get_pal_addr(void);
void machine_kexec(struct kimage *image)
{
relocate_new_kernel_t rnk;
--
1.4.1.rc1.g1ef9
-
: send the line "unsubscribe linux-ia64" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|