diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-02-25 12:12:17 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-25 12:12:17 +0100 |
| commit | d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902 (patch) | |
| tree | 4fe17a547c8c4e403c18cdc6a6c5e30c6f437bc9 /sound/soc/fsl/fsl_esai.h | |
| parent | bf68665d7a5647591258c120382fd64465db7d63 (diff) | |
| parent | 37c367ecdb9a01c9acc980e6e17913570a1788a7 (diff) | |
| download | linux-d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902.tar.bz2 | |
Merge branch 'for-linus' into HEAD
Diffstat (limited to 'sound/soc/fsl/fsl_esai.h')
| -rw-r--r-- | sound/soc/fsl/fsl_esai.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/fsl/fsl_esai.h b/sound/soc/fsl/fsl_esai.h index 9c9f957fcae1..75e14033e8d8 100644 --- a/sound/soc/fsl/fsl_esai.h +++ b/sound/soc/fsl/fsl_esai.h @@ -322,7 +322,7 @@ #define ESAI_xSMB_xS_SHIFT 0 #define ESAI_xSMB_xS_WIDTH 16 #define ESAI_xSMB_xS_MASK (((1 << ESAI_xSMB_xS_WIDTH) - 1) << ESAI_xSMB_xS_SHIFT) -#define ESAI_xSMB_xS(v) (((v) >> ESAI_xSMA_xS_WIDTH) & ESAI_xSMA_xS_MASK) +#define ESAI_xSMB_xS(v) (((v) >> ESAI_xSMA_xS_WIDTH) & ESAI_xSMB_xS_MASK) /* Port C Direction Register -- REG_ESAI_PRRC 0xF8 */ #define ESAI_PRRC_PDC_SHIFT 0 |