x86: remove duplicate get_bios_ebda() from rio.h
authorAkinobu Mita <akinobu.mita@gmail.com>
Sat, 19 Apr 2008 14:55:19 +0000 (23:55 +0900)
committerIngo Molnar <mingo@elte.hu>
Sat, 26 Apr 2008 15:35:47 +0000 (17:35 +0200)
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>
arch/x86/kernel/pci-calgary_64.c
include/asm-x86/rio.h

index 2edee22..e28ec49 100644 (file)
@@ -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;
index 3451c57..c9448bd 100644 (file)
@@ -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 */