diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-03-11 07:50:33 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-03-11 07:50:33 +0100 |
| commit | 5e3a227a64a1c9add0a4091989ef490342f716cf (patch) | |
| tree | eb3394fc6b58ac26caaacca4f1e3c2e55aac057f /arch/sh/include/cpu-sh4/cpu/cache.h | |
| parent | 9b745ab897199c2af9f21ca9681ef86d5b971002 (diff) | |
| parent | 7f35afd44b14a39307757629ebc0a199aade52d9 (diff) | |
Merge tag 'asoc-v3.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linussound-3.14-rc7
ASoC: Fixes for v3.14
A few things here:
- Avoid memory leaks in error cases with DPCM, this code has never been
that well tested in mainline due to the lack of mainline drivers but
we now have one queued for the merge window!
- Fix the N810 audio driver to load when booted with DT since the
platform was converted to DT during the merge window.
- Fixes for initialisation of some MFD drivers that are probably unused
in mainline
Diffstat (limited to 'arch/sh/include/cpu-sh4/cpu/cache.h')
| -rw-r--r-- | arch/sh/include/cpu-sh4/cpu/cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/cpu-sh4/cpu/cache.h b/arch/sh/include/cpu-sh4/cpu/cache.h index 7bfb9e8b069c..92c4cd119b66 100644 --- a/arch/sh/include/cpu-sh4/cpu/cache.h +++ b/arch/sh/include/cpu-sh4/cpu/cache.h @@ -17,7 +17,7 @@ #define SH_CACHE_COMBINED 4 #define SH_CACHE_ASSOC 8 -#define CCR 0xff00001c /* Address of Cache Control Register */ +#define SH_CCR 0xff00001c /* Address of Cache Control Register */ #define CCR_CACHE_OCE 0x0001 /* Operand Cache Enable */ #define CCR_CACHE_WT 0x0002 /* Write-Through (for P0,U0,P3) (else writeback)*/ #define CCR_CACHE_CB 0x0004 /* Copy-Back (for P1) (else writethrough) */ |