Merge remote-tracking branch 'asoc/fix/max98357a' into asoc-linus

[karo-tx-linux.git] / sound / oss / msnd.h

diff --git a/sound/oss/msnd.h b/sound/oss/msnd.h
index d0ca582c4583e302f171c21e653ea4e5c43f7959..c8be47ec2b7ea25c1a5aa722f44458445a5e7d83 100644 (file)
--- a/sound/oss/msnd.h
+++ b/sound/oss/msnd.h
@@ -24,8 +24,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: msnd.h,v 1.36 1999/03/21 17:05:42 andrewtv Exp $
- *
  ********************************************************************/
 #ifndef __MSND_H
 #define __MSND_H
@@ -213,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