diff options
| author |   Mark Brown <broonie@kernel.org> | 2015-04-09 11:23:57 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-09 11:23:57 +0100 |
| commit | 95a9ca74768089d89c17ba958d6f009aa9c18525 (patch) | |
| tree | 513200c0d5255eb1918f64fc11417858b1539ebb /sound/soc/intel/sst-atom-controls.h | |
| parent | ASoC: soc-core: initialize debugfs in snd_soc_instantiate_card() (diff) | |
| parent | Linux 4.0-rc7 (diff) | |
| download | linux-dev-95a9ca74768089d89c17ba958d6f009aa9c18525.tar.xz linux-dev-95a9ca74768089d89c17ba958d6f009aa9c18525.zip | |
Merge tag 'v4.0-rc7' into asoc-core
Linux 4.0-rc7
Diffstat (limited to 'sound/soc/intel/sst-atom-controls.h')
| -rw-r--r-- | sound/soc/intel/sst-atom-controls.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/sst-atom-controls.h b/sound/soc/intel/sst-atom-controls.h index dfebfdd5eb2a..daecc58f28af 100644 --- a/sound/soc/intel/sst-atom-controls.h +++ b/sound/soc/intel/sst-atom-controls.h @@ -150,7 +150,7 @@ enum sst_cmd_type { enum sst_task { SST_TASK_SBA = 1, - SST_TASK_MMX, + SST_TASK_MMX = 3, }; enum sst_type { |