1 files changed, 1 insertions, 118 deletions

diff --git a/include/asm-sparc64/ide.h b/include/asm-sparc64/ide.h
index 1282676da1cd..7125317a428d 100644
--- a/include/asm-sparc64/ide.h
+++ b/include/asm-sparc64/ide.h
@@ -1,118 +1 @@
-/*
- * ide.h: Ultra/PCI specific IDE glue.
- *
- * Copyright (C) 1997  David S. Miller (davem@caip.rutgers.edu)
- * Copyright (C) 1998  Eddie C. Dost   (ecd@skynet.be)
- */
-
-#ifndef _SPARC64_IDE_H
-#define _SPARC64_IDE_H
-
-#ifdef __KERNEL__
-
-#include <asm/pgalloc.h>
-#include <asm/io.h>
-#include <asm/spitfire.h>
-#include <asm/cacheflush.h>
-#include <asm/page.h>
-
-#ifndef MAX_HWIFS
-# ifdef CONFIG_BLK_DEV_IDEPCI
-#define MAX_HWIFS       10
-# else
-#define MAX_HWIFS       2
-# endif
-#endif
-
-#define __ide_insl(data_reg, buffer, wcount) \
-        __ide_insw(data_reg, buffer, (wcount)<<1)
-#define __ide_outsl(data_reg, buffer, wcount) \
-        __ide_outsw(data_reg, buffer, (wcount)<<1)
-
-/* On sparc64, I/O ports and MMIO registers are accessed identically.  */
-#define __ide_mm_insw   __ide_insw
-#define __ide_mm_insl   __ide_insl
-#define __ide_mm_outsw  __ide_outsw
-#define __ide_mm_outsl  __ide_outsl
-
-static inline unsigned int inw_be(void __iomem *addr)
-{
-        unsigned int ret;
-
-        __asm__ __volatile__("lduha [%1] %2, %0"
-                             : "=r" (ret)
-                             : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
-
-        return ret;
-}
-
-static inline void __ide_insw(void __iomem *port, void *dst, u32 count)
-{
-#ifdef DCACHE_ALIASING_POSSIBLE
-        unsigned long end = (unsigned long)dst + (count << 1);
-#endif
-        u16 *ps = dst;
-        u32 *pi;
-
-        if(((u64)ps) & 0x2) {
-                *ps++ = inw_be(port);
-                count--;
-        }
-        pi = (u32 *)ps;
-        while(count >= 2) {
-                u32 w;
-
-                w  = inw_be(port) << 16;
-                w |= inw_be(port);
-                *pi++ = w;
-                count -= 2;
-        }
-        ps = (u16 *)pi;
-        if(count)
-                *ps++ = inw_be(port);
-
-#ifdef DCACHE_ALIASING_POSSIBLE
-        __flush_dcache_range((unsigned long)dst, end);
-#endif
-}
-
-static inline void outw_be(unsigned short w, void __iomem *addr)
-{
-        __asm__ __volatile__("stha %0, [%1] %2"
-                             : /* no outputs */
-                             : "r" (w), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
-}
-
-static inline void __ide_outsw(void __iomem *port, void *src, u32 count)
-{
-#ifdef DCACHE_ALIASING_POSSIBLE
-        unsigned long end = (unsigned long)src + (count << 1);
-#endif
-        const u16 *ps = src;
-        const u32 *pi;
-
-        if(((u64)src) & 0x2) {
-                outw_be(*ps++, port);
-                count--;
-        }
-        pi = (const u32 *)ps;
-        while(count >= 2) {
-                u32 w;
-
-                w = *pi++;
-                outw_be((w >> 16), port);
-                outw_be(w, port);
-                count -= 2;
-        }
-        ps = (const u16 *)pi;
-        if(count)
-                outw_be(*ps, port);
-
-#ifdef DCACHE_ALIASING_POSSIBLE
-        __flush_dcache_range((unsigned long)src, end);
-#endif
-}
-
-#endif /* __KERNEL__ */
-
-#endif /* _SPARC64_IDE_H */
+#include <asm-sparc/ide.h>