diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-01-06 20:53:28 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-01-06 20:53:28 +0100 |
| commit | 3f37b26f8d57756b591383a9d8ce1cd628bc773c (patch) | |
| tree | 0311f4c48cfa7ace3940f3db203b930a2c2eaaa5 /arch/arc/include/asm/cache.h | |
| parent | c7b60a89516beb20a352ec85c73a8fccd5becf26 (diff) | |
| parent | bc42f363da213b4bf7c15a2dc87b2b1a85cde867 (diff) | |
Merge tag 'asoc-fix-v4.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Last minute fixes for v4.4
A few final fixes for v4.4, the main one being the two patches to the
new Sky Lake drivers which fix a previous incorrect fix that went in
during an earlier -rc.
Diffstat (limited to 'arch/arc/include/asm/cache.h')
| -rw-r--r-- | arch/arc/include/asm/cache.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arc/include/asm/cache.h b/arch/arc/include/asm/cache.h index abf06e81c929..210ef3e72332 100644 --- a/arch/arc/include/asm/cache.h +++ b/arch/arc/include/asm/cache.h @@ -62,9 +62,7 @@ extern int ioc_exists; #define ARC_REG_IC_IVIC 0x10 #define ARC_REG_IC_CTRL 0x11 #define ARC_REG_IC_IVIL 0x19 -#if defined(CONFIG_ARC_MMU_V3) || defined(CONFIG_ARC_MMU_V4) #define ARC_REG_IC_PTAG 0x1E -#endif #define ARC_REG_IC_PTAG_HI 0x1F /* Bit val in IC_CTRL */ |