[PATCH] epoll: fix delayed initialization bug

[linux-2.6-omap-h63xx.git] / include / sound / ac97_codec.h

diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index 996eeab683b0335d786f6b3b185f9cce8a8e1f81..2857cf0472df02116ff7e1c82ddc4a8906752752 100644 (file)
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -26,6 +26,7 @@
  */
 
 #include <linux/bitops.h>
+#include <linux/device.h>
 #include "pcm.h"
 #include "control.h"
 #include "info.h"
@@ -374,6 +375,9 @@
 #define AC97_HAS_NO_PC_BEEP    (1<<12) /* no PC Beep volume */
 #define AC97_HAS_NO_VIDEO      (1<<13) /* no Video volume */
 #define AC97_HAS_NO_CD         (1<<14) /* no CD volume */
+#define AC97_HAS_NO_MIC        (1<<15) /* no MIC volume */
+#define AC97_HAS_NO_TONE       (1<<16) /* no Tone volume */
+#define AC97_HAS_NO_STD_PCM    (1<<17) /* no standard AC97 PCM volume and mute */
 
 /* rates indexes */
 #define AC97_RATES_FRONT_DAC   0
@@ -520,6 +524,7 @@ struct _snd_ac97 {
        /* jack-sharing info */
        unsigned char indep_surround;
        unsigned char channel_mode;
+       struct device dev;
 };
 
 /* conditions */
@@ -573,8 +578,8 @@ enum {
 };
 
 struct ac97_quirk {
-       unsigned short vendor;  /* PCI vendor id */
-       unsigned short device;  /* PCI device id */
+       unsigned short subvendor; /* PCI subsystem vendor id */
+       unsigned short subdevice; /* PCI sybsystem device id */
        unsigned short mask;    /* device id bit mask, 0 = accept all */
        unsigned int codec_id;  /* codec id (if any), 0 = accept all */
        const char *name;       /* name shown as info */
@@ -599,4 +604,8 @@ struct ac97_enum {
        unsigned short mask;
        const char **texts;
 };
+
+/* ad hoc AC97 device driver access */
+extern struct bus_type ac97_bus_type;
+
 #endif /* __SOUND_AC97_CODEC_H */