x86: introduce /dev/mem restrictions with a config option

[linux-2.6-omap-h63xx.git] / include / asm-sparc / ide.h

diff --git a/include/asm-sparc/ide.h b/include/asm-sparc/ide.h
index a6d735a1310e32aa6a31a1dd453cd86fcff34a5e..afd1736ed4804d85c0b4099f764d613e4b45a69b 100644 (file)
--- a/include/asm-sparc/ide.h
+++ b/include/asm-sparc/ide.h
@@ -1,7 +1,6 @@
-/* $Id: ide.h,v 1.7 2002/01/16 20:58:40 davem Exp $
- * ide.h: SPARC PCI specific IDE glue.
+/* ide.h: SPARC PCI specific IDE glue.
  *
- * Copyright (C) 1997  David S. Miller (davem@caip.rutgers.edu)
+ * Copyright (C) 1997  David S. Miller (davem@davemloft.net)
  * Copyright (C) 1998  Eddie C. Dost   (ecd@skynet.be)
  * Adaptation from sparc64 version to sparc by Pete Zaitcev.
  */
@@ -18,9 +17,6 @@
 #undef  MAX_HWIFS
 #define MAX_HWIFS      2
 
-#define IDE_ARCH_OBSOLETE_INIT
-#define ide_default_io_ctl(base)       ((base) + 0x206) /* obsolete */
-
 #define __ide_insl(data_reg, buffer, wcount) \
        __ide_insw(data_reg, buffer, (wcount)<<1)
 #define __ide_outsl(data_reg, buffer, wcount) \
@@ -32,7 +28,7 @@
 #define __ide_mm_outsw __ide_outsw
 #define __ide_mm_outsl __ide_outsl
 
-static __inline__ void __ide_insw(unsigned long port,
+static inline void __ide_insw(unsigned long port,
                                  void *dst,
                                  unsigned long count)
 {
@@ -63,7 +59,7 @@ static __inline__ void __ide_insw(unsigned long port,
        /* __flush_dcache_range((unsigned long)dst, end); */ /* P3 see hme */
 }
 
-static __inline__ void __ide_outsw(unsigned long port,
+static inline void __ide_outsw(unsigned long port,
                                   const void *src,
                                   unsigned long count)
 {