author | Dan Murphy <dmurphy@ti.com> | |
Thu, 14 Mar 2013 13:37:44 +0000 (08:37 -0500) | ||
committer | Dan Murphy <dmurphy@ti.com> | |
Thu, 14 Mar 2013 13:37:44 +0000 (08:37 -0500) |
TI-Feature: omap5_audio_video_base
TI-Tree: git://gitorious.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree
TI-Branch: omap5_audio_video-3.8.y
* omap5_audio_video-3.8.y:
ARM: omap2: include linux/errno.h in hwmod_reset
Revert "ASoC: abe fw: Include ABE FW in kernel firmware directory."
Signed-off-by: Dan Murphy <dmurphy@ti.com>
TI-Tree: git://gitorious.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree
TI-Branch: omap5_audio_video-3.8.y
* omap5_audio_video-3.8.y:
ARM: omap2: include linux/errno.h in hwmod_reset
Revert "ASoC: abe fw: Include ABE FW in kernel firmware directory."
Signed-off-by: Dan Murphy <dmurphy@ti.com>
arch/arm/mach-omap2/omap_hwmod_reset.c | patch | blob | history | |
firmware/Makefile | patch | blob | history | |
firmware/omap4_abe | [deleted file] | patch | blob | history |
index bba43fa627d3c75a5f6ce3820152101782e4a991..65e186c9df55da7e5b662242ae8066430ded0e1d 100644 (file)
* 02110-1301 USA
*/
#include <linux/kernel.h>
+#include <linux/errno.h>
#include <sound/aess.h>
diff --git a/firmware/Makefile b/firmware/Makefile
index 734e95cba167e12a211845a300a2c1c7954bce80..cbb09ce9730ac0494dc43fbef5d7d6f2ddd05b0b 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
fw-shipped-$(CONFIG_SND_KORG1212) += korg/k1212.dsp
fw-shipped-$(CONFIG_SND_MAESTRO3) += ess/maestro3_assp_kernel.fw \
ess/maestro3_assp_minisrc.fw
-fw-shipped-$(CONFIG_SND_OMAP_SOC_ABE) += omap4_abe
fw-shipped-$(CONFIG_SND_SB16_CSP) += sb16/mulaw_main.csp sb16/alaw_main.csp \
sb16/ima_adpcm_init.csp \
sb16/ima_adpcm_playback.csp \
diff --git a/firmware/omap4_abe b/firmware/omap4_abe
deleted file mode 100755 (executable)
index c2a0e1f..0000000
Binary files a/firmware/omap4_abe and /dev/null differ
index c2a0e1f..0000000
Binary files a/firmware/omap4_abe and /dev/null differ