# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.879.82.8 -> 1.879.82.9 # include/asm-alpha/io.h 1.9 -> 1.9.1.1 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/01/26 maz@hina.wild-wind.fr.eu.org 1.879.82.9 # Add isa_virt_to_bus/isa_bus_to_virt API. # aha1740 driver wants it, so we can run 2.5 on the Jensen... :-) # -------------------------------------------- # diff -Nru a/include/asm-alpha/io.h b/include/asm-alpha/io.h --- a/include/asm-alpha/io.h Sun Jan 26 20:30:26 2003 +++ b/include/asm-alpha/io.h Sun Jan 26 20:30:26 2003 @@ -84,6 +84,8 @@ return phys <= __direct_map_size ? bus : 0; } +#define isa_virt_to_bus(a) virt_to_bus(a) + static inline void *bus_to_virt(unsigned long address) { void *virt; @@ -95,6 +97,8 @@ virt = phys_to_virt(address); return (long)address <= 0 ? NULL : virt; } + +#define isa_bus_to_virt(a) bus_to_virt(a) #else /* !__KERNEL__ */