---

yaml --- r: 93523 b: refs/heads/master c: ae5830a h: refs/heads/master i: 93521: 0b1b0b7 93519: b8d9c61 v: v3
git-mirror · Apr 26, 2008 · 5cb744d · 5cb744d
1 parent a855895
commit 5cb744d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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 */