Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / include / linux / ac97_codec.h

diff --git a/include/linux/ac97_codec.h b/include/linux/ac97_codec.h
index c3970bb..2ed2fd8 100644 (file)
--- a/include/linux/ac97_codec.h
+++ b/include/linux/ac97_codec.h
@@ -259,7 +259,7 @@ struct ac97_codec {
        int type;
        u32 model;
 
-       int modem:1;
+       unsigned int modem:1;
 
        struct ac97_ops *codec_ops;
 
@@ -323,6 +323,7 @@ struct ac97_ops
        
 #define AC97_DELUDED_MODEM     1       /* Audio codec reports its a modem */
 #define AC97_NO_PCM_VOLUME     2       /* Volume control is missing       */
+#define AC97_DEFAULT_POWER_OFF 4 /* Needs warm reset to power up */
 };
 
 extern int ac97_read_proc (char *page_out, char **start, off_t off,