diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-03-07 09:11:22 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-03-07 09:11:22 +0100 |
| commit | 9fedcc44f10d1e6820914f93a96d51bc7e653d98 (patch) | |
| tree | 71b0ec708dfd79977c70bb83a154d9349dbbb272 /sound/soc/tegra/tegra20_i2s.h | |
| parent | 2069d483b39a603a5f3428a19d3b4ac89aa97f48 (diff) | |
| parent | f73c06dc2cbf1ddf1c92f05f9843f923c8c69529 (diff) | |
Merge tag 'asoc-v3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.9
A few driver fixes, none of them terribly dramatic.
Diffstat (limited to 'sound/soc/tegra/tegra20_i2s.h')
| -rw-r--r-- | sound/soc/tegra/tegra20_i2s.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/tegra/tegra20_i2s.h b/sound/soc/tegra/tegra20_i2s.h index c27069d24d7..729958713cd 100644 --- a/sound/soc/tegra/tegra20_i2s.h +++ b/sound/soc/tegra/tegra20_i2s.h @@ -121,7 +121,7 @@ #define TEGRA20_I2S_TIMING_NON_SYM_ENABLE (1 << 12) #define TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_SHIFT 0 -#define TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US 0x7fff +#define TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US 0x7ff #define TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_MASK (TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US << TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_SHIFT) /* Fields in TEGRA20_I2S_FIFO_SCR */ |