From 5cb744dadc4a763678bf2abd7e89cf42184c981b Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Sat, 19 Apr 2008 23:55:19 +0900
Subject: [PATCH] --- yaml --- r: 93523 b: refs/heads/master c:
 ae5830a6f8278e1bb700a0956cacc9ceaf311f83 h: refs/heads/master i:   93521:
 0b1b0b75ab2f1e64aacbe5a00299e35e5da3f9b9   93519:
 b8d9c618abe9b7e5baf1282d6c419ddc13f8c0c7 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/x86/kernel/pci-calgary_64.c |  1 +
 trunk/include/asm-x86/rio.h            | 11 -----------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 5fa4dcdcd1e1..095d4ee6c77e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c0903f2abde95d931ecccac7198a685eb04e958
+refs/heads/master: ae5830a6f8278e1bb700a0956cacc9ceaf311f83
diff --git a/trunk/arch/x86/kernel/pci-calgary_64.c b/trunk/arch/x86/kernel/pci-calgary_64.c
index 2edee22e9c30..e28ec497e142 100644
--- a/trunk/arch/x86/kernel/pci-calgary_64.c
+++ b/trunk/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;
diff --git a/trunk/include/asm-x86/rio.h b/trunk/include/asm-x86/rio.h
index 3451c576e6af..c9448bd8968f 100644
--- a/trunk/include/asm-x86/rio.h
+++ b/trunk/include/asm-x86/rio.h
@@ -60,15 +60,4 @@ enum {
 	ALT_CALGARY	= 5,	/* Second Planar Calgary      */
 };
 
-/*
- * there is a real-mode segmented pointer pointing to the
- * 4K EBDA area at 0x40E.
- */
-static inline unsigned long get_bios_ebda(void)
-{
-	unsigned long address = *(unsigned short *)phys_to_virt(0x40EUL);
-	address <<= 4;
-	return address;
-}
-
 #endif /* __ASM_RIO_H */