diff options
author | Mark Brown <broonie@kernel.org> | 2015-08-06 12:34:41 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-08-06 12:34:41 +0100 |
commit | 113adf21cf1ed49b57098c1d0d6b38ffbe9ea1e6 (patch) | |
tree | 90505c4418561b98f773e5f7b549399e2868c239 /arch/blackfin/include/asm/mm-arch-hooks.h | |
parent | c3879956957b8de9fd6cbad604e668fd00c6506c (diff) | |
parent | 996034b117b467709dec7811ef134063934fa626 (diff) | |
download | talos-op-linux-113adf21cf1ed49b57098c1d0d6b38ffbe9ea1e6.tar.gz talos-op-linux-113adf21cf1ed49b57098c1d0d6b38ffbe9ea1e6.zip |
Merge tag 'asoc-fix-v4.2-rc3' into asoc-fix-topology
ASoC: Fixes for v4.2
A lot of small fixes here, a few to the core:
- Fix for binding DAPM stream widgets on devices with prefixes assigned
to them
- Minor fixes for the newly added topology interfaces
- Locking and memory leak fixes for DAPM
- Driver specific fixes
Diffstat (limited to 'arch/blackfin/include/asm/mm-arch-hooks.h')
-rw-r--r-- | arch/blackfin/include/asm/mm-arch-hooks.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/blackfin/include/asm/mm-arch-hooks.h b/arch/blackfin/include/asm/mm-arch-hooks.h deleted file mode 100644 index 1c5211ec338f..000000000000 --- a/arch/blackfin/include/asm/mm-arch-hooks.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Architecture specific mm hooks - * - * Copyright (C) 2015, IBM Corporation - * Author: Laurent Dufour <ldufour@linux.vnet.ibm.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#ifndef _ASM_BLACKFIN_MM_ARCH_HOOKS_H -#define _ASM_BLACKFIN_MM_ARCH_HOOKS_H - -#endif /* _ASM_BLACKFIN_MM_ARCH_HOOKS_H */ |