fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / sound / oss / nm256.h

diff --git a/sound/oss/nm256.h b/sound/oss/nm256.h
index 583004e..1dade90 100644 (file)
--- a/sound/oss/nm256.h
+++ b/sound/oss/nm256.h
@@ -60,7 +60,7 @@ struct nm256_info
        /* Physical address of the port. */
        u32 physaddr;
        /* Our mapped-in pointer. */
-       char *ptr;
+       char __iomem *ptr;
        /* PTR's offset within the physical port.  */
        u32 start_offset;
        /* And the offset of the end of the buffer.  */
@@ -115,7 +115,7 @@ struct nm256_info
     int has_irq;
 
     /* The card interrupt service routine. */
-    irqreturn_t (*introutine) (int, void *, struct pt_regs *);
+    irq_handler_t introutine;
 
     /* Current audio config, cached. */
     struct sinfo {
@@ -128,9 +128,6 @@ struct nm256_info
     struct nm256_info *next_card;
 };
 
-/* Debug flag--bigger numbers mean more output. */
-extern int nm256_debug;
-
 /* The BIOS signature. */
 #define NM_SIGNATURE 0x4e4d0000
 /* Signature mask. */
@@ -233,14 +230,14 @@ extern int nm256_debug;
 static inline int nm256_writePort##X (struct nm256_info *card,\
                                      int port, int offset, int value)\
 {\
-    u##X *addr;\
+    u##X __iomem *addr;\
 \
     if (nm256_debug > 1)\
         printk (KERN_DEBUG "Writing 0x%x to %d:0x%x\n", value, port, offset);\
 \
     NM_FIX_PORT;\
 \
-    addr = (u##X *)(card->port[port - 1].ptr + offset);\
+    addr = (u##X __iomem *)(card->port[port - 1].ptr + offset);\
     func (value, addr);\
     return 0;\
 }
@@ -253,11 +250,11 @@ DEFwritePortX (32, writel)
 static inline u##X nm256_readPort##X (struct nm256_info *card,\
                                        int port, int offset)\
 {\
-    u##X *addr;\
+    u##X __iomem *addr;\
 \
     NM_FIX_PORT\
 \
-    addr = (u##X *)(card->port[port - 1].ptr + offset);\
+    addr = (u##X __iomem *)(card->port[port - 1].ptr + offset);\
     return func(addr);\
 }
 
@@ -284,7 +281,7 @@ nm256_readBuffer8 (struct nm256_info *card, u8 *dst, int port, int offset,
 }
 
 /* Returns a non-zero value if we should use the coefficient cache. */
-extern int nm256_cachedCoefficients (struct nm256_info *card);
+static int nm256_cachedCoefficients (struct nm256_info *card);
 
 #endif
 \f