Merge branch 'fix/misc' into topic/misc

This commit is contained in:
Takashi Iwai
2010-10-11 13:45:22 +02:00
594 zmienionych plików z 5033 dodań i 3168 usunięć

Wyświetl plik

@@ -545,6 +545,10 @@ static int __devinit get_oxygen_model(struct oxygen *chip,
chip->model.suspend = claro_suspend;
chip->model.resume = claro_resume;
chip->model.set_adc_params = set_ak5385_params;
chip->model.device_config = PLAYBACK_0_TO_I2S |
PLAYBACK_1_TO_SPDIF |
CAPTURE_0_FROM_I2S_2 |
CAPTURE_1_FROM_SPDIF;
break;
}
if (id->driver_data == MODEL_MERIDIAN ||