diff options
| author |  Takashi Iwai <tiwai@suse.de>
| 2012-01-12 09:59:14 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de>
| 2012-01-12 09:59:14 +0100 |
| commit | 627b79628f56c3deeb17dec1edf6899b49552fa4 (patch) | |
| tree | deac8b2cce5d70708fa944a270ee031f069226d8 /sound/pci/oxygen/xonar_cs43xx.c | |
| parent | Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broon... (diff) | |
| parent | ALSA: usb-audio: add Yamaha MOX6/MOX8 support (diff) | |
| download | linux-627b79628f56c3deeb17dec1edf6899b49552fa4.tar.gz linux-627b79628f56c3deeb17dec1edf6899b49552fa4.tar.bz2 linux-627b79628f56c3deeb17dec1edf6899b49552fa4.zip | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/oxygen/xonar_cs43xx.c')
| -rw-r--r-- | sound/pci/oxygen/xonar_cs43xx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/oxygen/xonar_cs43xx.c b/sound/pci/oxygen/xonar_cs43xx.c index 252719101c42..c8febf4b9bd6 100644 --- a/sound/pci/oxygen/xonar_cs43xx.c +++ b/sound/pci/oxygen/xonar_cs43xx.c @@ -418,6 +418,7 @@ static const struct oxygen_model model_xonar_d1 = { .device_config = PLAYBACK_0_TO_I2S | PLAYBACK_1_TO_SPDIF | CAPTURE_0_FROM_I2S_2 | + CAPTURE_1_FROM_SPDIF | AC97_FMIC_SWITCH, .dac_channels_pcm = 8, .dac_channels_mixer = 8, |