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/mips/lib/memset.S | |
| parent | c7b60a89516beb20a352ec85c73a8fccd5becf26 (diff) | |
| parent | bc42f363da213b4bf7c15a2dc87b2b1a85cde867 (diff) | |
| download | linux-3f37b26f8d57756b591383a9d8ce1cd628bc773c.tar.bz2 | |
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/mips/lib/memset.S')
| -rw-r--r-- | arch/mips/lib/memset.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/lib/memset.S b/arch/mips/lib/memset.S index b8e63fd00375..8f0019a2e5c8 100644 --- a/arch/mips/lib/memset.S +++ b/arch/mips/lib/memset.S @@ -283,6 +283,8 @@ LEAF(memset) 1: #ifndef CONFIG_EVA FEXPORT(__bzero) +#else +FEXPORT(__bzero_kernel) #endif __BUILD_BZERO LEGACY_MODE |