Merge tag 'clone3-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner...

[linux-2.6-microblaze.git] / include / sound / hda_codec.h

diff --git a/include/sound/hda_codec.h b/include/sound/hda_codec.h
index a7c6025..8f46ff3 100644 (file)
--- a/include/sound/hda_codec.h
+++ b/include/sound/hda_codec.h
@@ -18,6 +18,9 @@
 #include <sound/hda_verbs.h>
 #include <sound/hda_regmap.h>
 
+#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
+#define IS_CFL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa348)
+
 /*
  * Structures
  */
@@ -268,9 +271,6 @@ struct hda_codec {
        unsigned long jackpoll_interval; /* In jiffies. Zero means no poll, rely on unsol events */
        struct delayed_work jackpoll_work;
 
-       /* jack detection */
-       struct snd_array jacks;
-
        int depop_delay; /* depop delay in ms, -1 for default delay time */
 
        /* fix-up list */