Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Overwrite pin config on intel DG45ID board.
  intelhdmi - dont power off HDA link
  ALSA: hrtimer - Fix lock-up
  ALSA: intelhdmi - add channel mapping for typical configurations
  ALSA: intelhdmi - channel mapping applies to Pin
  ALSA: intelhdmi - accept DisplayPort pin
  ALSA: hda - show HBR(High Bit Rate) pin cap in procfs
  ALSA: hda - Fix LED GPIO setup for HP laptops with IDT codecs
  ASoC: Fix build of OMAP sound drivers
  ALSA: opti93x: fix irq releasing if the irq cannot be allocated

1 files changed, 6 insertions, 1 deletions

diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c
index 09476fc1ab64..c9afc04adac8 100644
--- a/sound/pci/hda/hda_proc.c
+++ b/sound/pci/hda/hda_proc.c
@@ -240,9 +240,14 @@ static void print_pin_caps(struct snd_info_buffer *buffer,
                 /* Realtek uses this bit as a different meaning */
                 if ((codec->vendor_id >> 16) == 0x10ec)
                         snd_iprintf(buffer, " R/L");
-                else
+                else {
+                        if (caps & AC_PINCAP_HBR)
+                                snd_iprintf(buffer, " HBR");
                         snd_iprintf(buffer, " HDMI");
+                }
         }
+        if (caps & AC_PINCAP_DP)
+                snd_iprintf(buffer, " DP");
         if (caps & AC_PINCAP_TRIG_REQ)
                 snd_iprintf(buffer, " Trigger");
         if (caps & AC_PINCAP_IMP_SENSE)