diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-08-20 22:14:26 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-08-20 22:14:26 +0200 |
commit | ddf83485d7da468251716b8040bac1280622181e (patch) | |
tree | d28e9b511dedcfed447577f4bb49a99b244a9430 /sound/pci/hda/hda_proc.c | |
parent | 099d53c308f50e8ee5b6638ec3f40f0104b3ee31 (diff) | |
parent | 535b6c51fe8293c88ce919cdfc4390c67a1cb6d1 (diff) | |
download | linux-ddf83485d7da468251716b8040bac1280622181e.tar.bz2 |
Merge branch 'for-linus' into for-next
Conflicts:
sound/pci/hda/hda_codec.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_proc.c')
-rw-r--r-- | sound/pci/hda/hda_proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index 32bb3d9bfc62..045e5d32f5de 100644 --- a/sound/pci/hda/hda_proc.c +++ b/sound/pci/hda/hda_proc.c @@ -415,7 +415,7 @@ static void print_digital_conv(struct snd_info_buffer *buffer, if (digi1 & AC_DIG1_EMPHASIS) snd_iprintf(buffer, " Preemphasis"); if (digi1 & AC_DIG1_COPYRIGHT) - snd_iprintf(buffer, " Copyright"); + snd_iprintf(buffer, " Non-Copyright"); if (digi1 & AC_DIG1_NONAUDIO) snd_iprintf(buffer, " Non-Audio"); if (digi1 & AC_DIG1_PROFESSIONAL) |