summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAkinobu Mita <akinobu.mita@gmail.com>2008-04-19 23:55:19 +0900
committerIngo Molnar <mingo@elte.hu>2008-04-26 17:35:47 +0200
commitae5830a6f8278e1bb700a0956cacc9ceaf311f83 (patch)
treed6716a378cced4be66ccab5e7fe5ccb1b4f17520 /arch
parent2c0903f2abde95d931ecccac7198a685eb04e958 (diff)
downloadlinux-ae5830a6f8278e1bb700a0956cacc9ceaf311f83.tar.bz2
x86: remove duplicate get_bios_ebda() from rio.h
get_bios_ebda() exists in asm/rio.h and asm/bios_ebda.h. This patch removes the one in asm/rio.h. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/pci-calgary_64.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index 2edee22e9c30..e28ec497e142 100644
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
@@ -43,6 +43,7 @@
#include <asm/system.h>
#include <asm/dma.h>
#include <asm/rio.h>
+#include <asm/bios_ebda.h>
#ifdef CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT
int use_calgary __read_mostly = 1;