diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-20 23:43:06 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-20 23:43:06 +0100 |
| commit | ebef7cfc81942686a994ca6239b195040f5d1e4d (patch) | |
| tree | 3e2c7c1d4d80a20bc48dce5f334ea532bcf60dbd /sound/pci/ca0106/ca0106.h | |
| parent | 6bcdbd55b4c603d9741398d081133fcc50a10b6c (diff) | |
| parent | 3d4758299fa6180ff9304634c67ffdd44272c8e8 (diff) | |
| download | op-kernel-dev-ebef7cfc81942686a994ca6239b195040f5d1e4d.zip op-kernel-dev-ebef7cfc81942686a994ca6239b195040f5d1e4d.tar.gz | |
Merge branch 'topic/ca0106-spdif-stream' into topic/ca0106
Diffstat (limited to 'sound/pci/ca0106/ca0106.h')
| -rw-r--r-- | sound/pci/ca0106/ca0106.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h index a6943cb..14b8d9a 100644 --- a/sound/pci/ca0106/ca0106.h +++ b/sound/pci/ca0106/ca0106.h @@ -694,7 +694,8 @@ struct snd_ca0106 { struct snd_ca0106_channel playback_channels[4]; struct snd_ca0106_channel capture_channels[4]; - u32 spdif_bits[4]; /* s/pdif out setup */ + u32 spdif_bits[4]; /* s/pdif out default setup */ + u32 spdif_str_bits[4]; /* s/pdif out per-stream setup */ int spdif_enable; int capture_source; int i2c_capture_source; |
