This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / asm-alpha / io.h

diff --git a/include/asm-alpha/io.h b/include/asm-alpha/io.h
index 68907d9..9e9de8e 100644 (file)
--- a/include/asm-alpha/io.h
+++ b/include/asm-alpha/io.h
@@ -282,12 +282,6 @@ static inline void __iomem *ioremap(unsigned long port, unsigned long size)
        return IO_CONCAT(__IO_PREFIX,ioremap) (port, size);
 }
 
-static inline void __iomem *__ioremap(unsigned long port, unsigned long size,
-                                     unsigned long flags)
-{
-       return ioremap(port, size);
-}
-
 static inline void __iomem * ioremap_nocache(unsigned long offset,
                                             unsigned long size)
 {
@@ -495,8 +489,6 @@ extern inline void writeq(u64 b, volatile void __iomem *addr)
 #define readl_relaxed(addr) __raw_readl(addr)
 #define readq_relaxed(addr) __raw_readq(addr)
 
-#define mmiowb()
-
 /*
  * String version of IO memory access ops:
  */
@@ -631,6 +623,16 @@ isa_memcpy_toio(unsigned long offset, const void *src, long n)
        iounmap(addr);
 }
 
+static inline int
+isa_check_signature(unsigned long offset, const unsigned char *sig, long len)
+{
+       void __iomem *addr = ioremap(offset, len);
+       int ret = check_signature(addr, sig, len);
+       iounmap(addr);
+       return ret;
+}
+
+
 /*
  * The Alpha Jensen hardware for some rather strange reason puts
  * the RTC clock at 0x170 instead of 0x70. Probably due to some
@@ -656,16 +658,6 @@ isa_memcpy_toio(unsigned long offset, const void *src, long n)
 #define dma_cache_wback(_start,_size)          do { } while (0)
 #define dma_cache_wback_inv(_start,_size)      do { } while (0)
 
-/*
- * Some mucking forons use if[n]def writeq to check if platform has it.
- * It's a bloody bad idea and we probably want ARCH_HAS_WRITEQ for them
- * to play with; for now just use cpp anti-recursion logics and make sure
- * that damn thing is defined and expands to itself.
- */
-
-#define writeq writeq
-#define readq readq
-
 #endif /* __KERNEL__ */
 
 #endif /* __ALPHA_IO_H */