git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block
[pandora-kernel.git]
/
sound
/
pci
/
oxygen
/
xonar_pcm179x.c
diff --git
a/sound/pci/oxygen/xonar_pcm179x.c
b/sound/pci/oxygen/xonar_pcm179x.c
index
32d096c
..
8433aa7
100644
(file)
--- a/
sound/pci/oxygen/xonar_pcm179x.c
+++ b/
sound/pci/oxygen/xonar_pcm179x.c
@@
-1074,6
+1074,7
@@
static const struct oxygen_model model_xonar_st = {
.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 = 2,
.dac_channels_mixer = 2,