Merge branch 'topic/hda-modularize' into topic/hda

[linux-2.6-omap-h63xx.git] / sound / pci / hda / hda_codec.h

diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 6612d0f20bc6c2f12f67fcac726ead0bd2e29332..5587d416229f9ff54230f7e10f5ac0f3b1d97e77 100644 (file)
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -615,8 +615,6 @@ struct hda_bus {
        /* unsolicited event queue */
        struct hda_bus_unsolicited *unsol;
 
-       struct snd_info_entry *proc;
-
        /* assigned PCMs */
        DECLARE_BITMAP(pcm_dev_bits, SNDRV_PCM_DEVICES);
 
@@ -795,6 +793,10 @@ struct hda_codec {
        int power_count;        /* current (global) power refcount */
        struct delayed_work power_work; /* delayed task for powerdown */
 #endif
+
+       /* codec-specific additional proc output */
+       void (*proc_widget_hook)(struct snd_info_buffer *buffer,
+                                struct hda_codec *codec, hda_nid_t nid);
 };
 
 /* direction */