Merge branch 'topic/asoc' into for-linus

2009-01-05 18:34:21 +01:00 · 2009-01-05 18:34:21 +01:00 · 9d7eff608d
commit 9d7eff608d
parent cd8faac38c cad9d90ec3
1 changed files with 4 additions and 0 deletions
--- a/sound/soc/davinci/davinci-sffsdr.c
+++ b/sound/soc/davinci/davinci-sffsdr.c
@ -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");