This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / asm-sparc / dma.h

diff --git a/include/asm-sparc/dma.h b/include/asm-sparc/dma.h
index 59a07c7..8ec206a 100644 (file)
--- a/include/asm-sparc/dma.h
+++ b/include/asm-sparc/dma.h
@@ -69,7 +69,7 @@ enum dvma_rev {
 struct sbus_dma {
        struct sbus_dma *next;
        struct sbus_dev *sdev;
-       unsigned long regs;
+       void __iomem *regs;
 
        /* Status, misc info */
        int node;                /* Prom node for this DMA device */
@@ -198,7 +198,7 @@ extern void dvma_init(struct sbus_bus *);
 /* Pause until counter runs out or BIT isn't set in the DMA condition
  * register.
  */
-extern __inline__ void sparc_dma_pause(struct sparc_dma_registers *regs,
+static inline void sparc_dma_pause(struct sparc_dma_registers *regs,
                                       unsigned long bit)
 {
        int ctr = 50000;   /* Let's find some bugs ;) */