Merge branch 'topic/asoc' into for-linus (9d7eff60) · Commits · e / devices / android_kernel_teracube_emerald

sound/soc/davinci/davinci-sffsdr.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@
		#include <sound/soc-dapm.h>

		#include <asm/dma.h>
		#include <asm/mach-types.h>
		#include <asm/plat-sffsdr/sffsdr-fpga.h>

		#include <mach/mcbsp.h>
		@@ -115,6 +116,9 @@ static int __init sffsdr_init(void)
		{
		int ret;

		if (!machine_is_sffsdr())
		return -EINVAL;

		sffsdr_snd_device = platform_device_alloc("soc-audio", 0);
		if (!sffsdr_snd_device) {
		printk(KERN_ERR "platform device allocation failed\n");