aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ca0106/ca0106.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-20 17:43:06 -0500
committerTakashi Iwai <tiwai@suse.de>2008-12-20 17:43:06 -0500
commitebef7cfc81942686a994ca6239b195040f5d1e4d (patch)
tree3e2c7c1d4d80a20bc48dce5f334ea532bcf60dbd /sound/pci/ca0106/ca0106.h
parent6bcdbd55b4c603d9741398d081133fcc50a10b6c (diff)
parent3d4758299fa6180ff9304634c67ffdd44272c8e8 (diff)
Merge branch 'topic/ca0106-spdif-stream' into topic/ca0106
Diffstat (limited to 'sound/pci/ca0106/ca0106.h')
-rw-r--r--sound/pci/ca0106/ca0106.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h
index a6943cb0d209..14b8d9a91aae 100644
--- a/sound/pci/ca0106/ca0106.h
+++ b/sound/pci/ca0106/ca0106.h
@@ -694,7 +694,8 @@ struct snd_ca0106 {
694 694
695 struct snd_ca0106_channel playback_channels[4]; 695 struct snd_ca0106_channel playback_channels[4];
696 struct snd_ca0106_channel capture_channels[4]; 696 struct snd_ca0106_channel capture_channels[4];
697 u32 spdif_bits[4]; /* s/pdif out setup */ 697 u32 spdif_bits[4]; /* s/pdif out default setup */
698 u32 spdif_str_bits[4]; /* s/pdif out per-stream setup */
698 int spdif_enable; 699 int spdif_enable;
699 int capture_source; 700 int capture_source;
700 int i2c_capture_source; 701 int i2c_capture_source;