diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-18 09:17:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-18 09:17:14 -0400 |
| commit | 2a5e9dab9acfb76cf0a4f96a9a17dc6eab2e472b (patch) | |
| tree | 597933dc20456219f38173b640a8a07e83c2f1b8 /sound | |
| parent | d55f0691c041dba46daad7790b8f2631acb55f9a (diff) | |
| parent | c5d5a58d7ff977289c4bba8eae447c9afa66516b (diff) | |
Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/sh/rcar/rsnd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 9cc6986a8cfb..5dd87f4c919e 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h | |||
| @@ -220,8 +220,8 @@ int rsnd_gen_path_exit(struct rsnd_priv *priv, | |||
| 220 | void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv, | 220 | void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv, |
| 221 | struct rsnd_mod *mod, | 221 | struct rsnd_mod *mod, |
| 222 | enum rsnd_reg reg); | 222 | enum rsnd_reg reg); |
| 223 | #define rsnd_is_gen1(s) ((s)->info->flags & RSND_GEN1) | 223 | #define rsnd_is_gen1(s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN1) |
| 224 | #define rsnd_is_gen2(s) ((s)->info->flags & RSND_GEN2) | 224 | #define rsnd_is_gen2(s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN2) |
| 225 | 225 | ||
| 226 | /* | 226 | /* |
| 227 | * R-Car ADG | 227 | * R-Car ADG |