These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / sound / jack.h

diff --git a/kernel/include/sound/jack.h b/kernel/include/sound/jack.h
index 2182350..23bede1 100644 (file)
--- a/kernel/include/sound/jack.h
+++ b/kernel/include/sound/jack.h
@@ -73,6 +73,8 @@ enum snd_jack_types {
 
 struct snd_jack {
        struct input_dev *input_dev;
+       struct list_head kctl_list;
+       struct snd_card *card;
        int registered;
        int type;
        const char *id;
@@ -85,7 +87,8 @@ struct snd_jack {
 #ifdef CONFIG_SND_JACK
 
 int snd_jack_new(struct snd_card *card, const char *id, int type,
-                struct snd_jack **jack);
+                struct snd_jack **jack, bool initial_kctl, bool phantom_jack);
+int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name, int mask);
 void snd_jack_set_parent(struct snd_jack *jack, struct device *parent);
 int snd_jack_set_key(struct snd_jack *jack, enum snd_jack_types type,
                     int keytype);
@@ -93,9 +96,13 @@ int snd_jack_set_key(struct snd_jack *jack, enum snd_jack_types type,
 void snd_jack_report(struct snd_jack *jack, int status);
 
 #else
-
 static inline int snd_jack_new(struct snd_card *card, const char *id, int type,
-                              struct snd_jack **jack)
+                              struct snd_jack **jack, bool initial_kctl, bool phantom_jack)
+{
+       return 0;
+}
+
+static inline int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name, int mask)
 {
        return 0;
 }