vserver 1.9.3

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

diff --git a/sound/oss/msnd.h b/sound/oss/msnd.h
index 7b36192..3589480 100644 (file)
--- a/sound/oss/msnd.h
+++ b/sound/oss/msnd.h
@@ -154,10 +154,11 @@
 #define DSPTOPC_BASED(w)       (((w) - DSP_BASE_ADDR) * 2)
 
 #ifdef SLOWIO
-#  undef outb
-#  undef inb
-#  define outb                 outb_p
-#  define inb                  inb_p
+#define msnd_outb                      outb_p
+#define msnd_inb                       inb_p
+#else
+#define msnd_outb                      outb
+#define msnd_inb                       inb
 #endif
 
 /* JobQueueStruct */
@@ -266,8 +267,8 @@ void                                msnd_fifo_init(msnd_fifo *f);
 void                           msnd_fifo_free(msnd_fifo *f);
 int                            msnd_fifo_alloc(msnd_fifo *f, size_t n);
 void                           msnd_fifo_make_empty(msnd_fifo *f);
-int                            msnd_fifo_write(msnd_fifo *f, const char *buf, size_t len, int user);
-int                            msnd_fifo_read(msnd_fifo *f, char *buf, size_t len, int user);
+int                            msnd_fifo_write(msnd_fifo *f, const char *buf, size_t len);
+int                            msnd_fifo_read(msnd_fifo *f, char *buf, size_t len);
 
 int                            msnd_wait_TXDE(multisound_dev_t *dev);
 int                            msnd_wait_HC0(multisound_dev_t *dev);