Merge remote-tracking branches 'asoc/topic/uda1380', 'asoc/topic/unregister', 'asoc...

[sfrench/cifs-2.6.git] / sound / oss / msnd.h

diff --git a/sound/oss/msnd.h b/sound/oss/msnd.h
index 61b3955481c56da1f7b88ca2ac43fd08ed5ef15a..c8be47ec2b7ea25c1a5aa722f44458445a5e7d83 100644 (file)
--- a/sound/oss/msnd.h
+++ b/sound/oss/msnd.h
@@ -211,7 +211,7 @@ typedef struct multisound_dev {
 
        /* State variables */
        enum { msndClassic, msndPinnacle } type;
-       mode_t mode;
+       fmode_t mode;
        unsigned long flags;
 #define F_RESETTING                    0
 #define F_HAVEDIGITAL                  1