diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-11 07:45:22 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-11 07:45:22 -0400 |
| commit | 4e83998f5af010a928495988c586ea2926624db9 (patch) | |
| tree | e72d346172a30bbee165d7f585784724906da416 /sound/pci/oxygen | |
| parent | dd1d3a49db4ae5c6afffadaff526b96c7993c7dd (diff) | |
| parent | d4cfa4d12f46e2520f4c1d1a92e891ce068b7464 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/pci/oxygen')
| -rw-r--r-- | sound/pci/oxygen/oxygen.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index 1d915efb2695..98a8eb3c92f7 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c | |||
| @@ -545,6 +545,10 @@ static int __devinit get_oxygen_model(struct oxygen *chip, | |||
| 545 | chip->model.suspend = claro_suspend; | 545 | chip->model.suspend = claro_suspend; |
| 546 | chip->model.resume = claro_resume; | 546 | chip->model.resume = claro_resume; |
| 547 | chip->model.set_adc_params = set_ak5385_params; | 547 | chip->model.set_adc_params = set_ak5385_params; |
| 548 | chip->model.device_config = PLAYBACK_0_TO_I2S | | ||
| 549 | PLAYBACK_1_TO_SPDIF | | ||
| 550 | CAPTURE_0_FROM_I2S_2 | | ||
| 551 | CAPTURE_1_FROM_SPDIF; | ||
| 548 | break; | 552 | break; |
| 549 | } | 553 | } |
| 550 | if (id->driver_data == MODEL_MERIDIAN || | 554 | if (id->driver_data == MODEL_MERIDIAN || |