diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-04 18:30:01 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-04 18:30:01 +0100 |
| commit | 986a622df307644af14618bee54c901aa74816da (patch) | |
| tree | 6da87812b9120634381e3e3987e115f90bd562e0 /sound/soc/blackfin/bf5xx-sport.h | |
| parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff) | |
| parent | 28e5ca73ef9072ed58dbb81cfff6f908be8e3cd4 (diff) | |
| download | linux-rt-986a622df307644af14618bee54c901aa74816da.tar.gz | |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Diffstat (limited to 'sound/soc/blackfin/bf5xx-sport.h')
| -rw-r--r-- | sound/soc/blackfin/bf5xx-sport.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/blackfin/bf5xx-sport.h b/sound/soc/blackfin/bf5xx-sport.h index 5ab60bd613ea..9fc2192feb3b 100644 --- a/sound/soc/blackfin/bf5xx-sport.h +++ b/sound/soc/blackfin/bf5xx-sport.h @@ -128,7 +128,7 @@ void sport_done(struct sport_device *sport); /* note: multichannel is in units of 8 channels, tdm_count is number of channels * NOT / 8 ! all channels are enabled by default */ int sport_set_multichannel(struct sport_device *sport, int tdm_count, - u32 mask, int packed); + u32 tx_mask, u32 rx_mask, int packed); int sport_config_rx(struct sport_device *sport, unsigned int rcr1, unsigned int rcr2, |