diff options
| author | Takashi Iwai | 2013-09-11 12:38:45 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2013-09-11 12:38:45 +0200 |
| commit | 3d0049e8529adaa36c38a7b400792f6c37b66c92 (patch) | |
| tree | 7d2e30a5e3f12207305ffc76d80d310c0a95fdcc /include/sound | |
| parent | ALSA: hda - Add CS4208 codec support for MacBook 6,1 and 6,2 (diff) | |
| parent | Merge remote-tracking branch 'asoc/fix/rsnd' into asoc-linus (diff) | |
| download | kernel-qcow2-linux-3d0049e8529adaa36c38a7b400792f6c37b66c92.tar.gz kernel-qcow2-linux-3d0049e8529adaa36c38a7b400792f6c37b66c92.tar.xz kernel-qcow2-linux-3d0049e8529adaa36c38a7b400792f6c37b66c92.zip | |
Merge tag 'asoc-v3.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.12
A few small fixes, nothing with any broad impact but all useful for the
affected systems. The Kirkwood compatible string change is fixing up a
string just added in the merge window so that we don't get any changes
in released kernels.
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/rcar_snd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/rcar_snd.h b/include/sound/rcar_snd.h index d35412ae03b3..fe66533e9b7a 100644 --- a/include/sound/rcar_snd.h +++ b/include/sound/rcar_snd.h @@ -55,7 +55,7 @@ struct rsnd_ssi_platform_info { /* * flags */ -#define RSND_SCU_USB_HPBIF (1 << 31) /* it needs RSND_SSI_DEPENDENT */ +#define RSND_SCU_USE_HPBIF (1 << 31) /* it needs RSND_SSI_DEPENDENT */ struct rsnd_scu_platform_info { u32 flags; |