UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc

This commit is contained in:
Takashi Iwai 2009-01-05 18:31:38 +01:00
parent ac11a2b35c 5cf1c00b0e
commit cad9d90ec3
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/davinci/davinci-sffsdr.c
View File

@ -24,6 +24,7 @@
#include <sound/soc-dapm.h> #include <sound/soc-dapm.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/mach-types.h>
#include <asm/plat-sffsdr/sffsdr-fpga.h> #include <asm/plat-sffsdr/sffsdr-fpga.h>
#include <mach/mcbsp.h> #include <mach/mcbsp.h>
@ -115,6 +116,9 @@ static int __init sffsdr_init(void)
{ {
int ret; int ret;
if (!machine_is_sffsdr())
return -EINVAL;
sffsdr_snd_device = platform_device_alloc("soc-audio", 0); sffsdr_snd_device = platform_device_alloc("soc-audio", 0);
if (!sffsdr_snd_device) { if (!sffsdr_snd_device) {
printk(KERN_ERR "platform device allocation failed\n"); printk(KERN_ERR "platform device allocation failed\n");