X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Farch-ebsa285%2Fio.h;h=776f9d377057d002082257902721e3f3d52f6cf0;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=f9c7291418600e6ba59c8078eecc347a87780fbd;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git diff --git a/include/asm-arm/arch-ebsa285/io.h b/include/asm-arm/arch-ebsa285/io.h index f9c729141..776f9d377 100644 --- a/include/asm-arm/arch-ebsa285/io.h +++ b/include/asm-arm/arch-ebsa285/io.h @@ -24,6 +24,7 @@ #define __io(a) ((void __iomem *)(PCIO_BASE + (a))) #if 1 #define __mem_pci(a) (a) +#define __mem_isa(a) ((a) + PCIMEM_BASE) #else static inline void __iomem *___mem_pci(void __iomem *p) @@ -33,7 +34,14 @@ static inline void __iomem *___mem_pci(void __iomem *p) return p; } +static inline void __iomem *___mem_isa(void __iomem *p) +{ + unsigned long a = (unsigned long)p; + BUG_ON(a >= 16*1048576); + return p + PCIMEM_BASE; +} #define __mem_pci(a) ___mem_pci(a) +#define __mem_isa(a) ___mem_isa(a) #endif #endif