diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /include/asm-alpha/jensen.h | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'include/asm-alpha/jensen.h')
| -rw-r--r-- | include/asm-alpha/jensen.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/asm-alpha/jensen.h b/include/asm-alpha/jensen.h index 826dfc54d..4ebbb2102 100644 --- a/include/asm-alpha/jensen.h +++ b/include/asm-alpha/jensen.h @@ -80,24 +80,6 @@ #endif /* - * Change virtual addresses to bus addresses and vv. - * - * NOTE! On the Jensen, the physical address is the same - * as the bus address, but this is not necessarily true on - * other alpha hardware. - */ -__EXTERN_INLINE unsigned long jensen_virt_to_bus(void * address) -{ - return virt_to_phys(address); -} - -__EXTERN_INLINE void * jensen_bus_to_virt(unsigned long address) -{ - return phys_to_virt(address); -} - - -/* * Handle the "host address register". This needs to be set * to the high 7 bits of the EISA address. This is also needed * for EISA IO addresses, which are only 16 bits wide (the @@ -306,8 +288,6 @@ __EXTERN_INLINE int jensen_is_ioaddr(unsigned long addr) #ifdef __WANT_IO_DEF -#define virt_to_bus jensen_virt_to_bus -#define bus_to_virt jensen_bus_to_virt #define __inb jensen_inb #define __inw jensen_inw #define __inl jensen_inl |